Commit graph

6155 commits

Author SHA1 Message Date
Adam Warner
eb0bd026d7
Sync master back into development (#5296) 2023-06-04 22:16:58 +01:00
Adam Warner
7e95371fe8
Do not remove -all|exact when not surrounded by space in query.sh (#5300) 2023-06-04 22:16:35 +01:00
Adam Warner
499998c537
Remove option to set static IP address if DHCPCD is installed (#5111) 2023-06-04 22:09:04 +01:00
Christian König
8bf4ab0cd6
Remove option to set static IP address if DHCPCD is installed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:59:44 +02:00
Christian König
088b2c2920
Do not remove -all|excat when not sourrounded by space in query.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:57:31 +02:00
yubiuser
34a261e522
Bump tox from 4.5.1 to 4.5.2 in /test (#5304) 2023-06-04 22:15:36 +02:00
Christian König
ba3e290915
Fix shellcheck errors
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:21:48 +02:00
Christian König
53fb7ae0ef
Use shellcheck in smoke-tests. RIP stickler
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:06:44 +02:00
Christian König
366345e87e
Fix no_installs
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 20:31:48 +02:00
DL6ER
667418c71d
Use new FTL binary names
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-04 20:02:38 +02:00
dependabot[bot]
b0fa3795e9
Bump tox from 4.5.1 to 4.5.2 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.5.1...4.5.2)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-03 10:58:23 +00:00
Christian König
ec82aec55f
centos_common_support.py was removed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-02 00:13:57 +02:00
Christian König
7da57c6acd
Don't check and install old FTL config file
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-02 00:08:50 +02:00
Christian König
0becc7615a
Run prestart
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 23:51:03 +02:00
Christian König
a4322c624f
Fix gravity in tests
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 22:00:40 +02:00
Christian König
001024b4da
Fix Tests No2
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 20:41:54 +02:00
Adam Warner
792b0d419b
Test fixes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-01 19:29:47 +01:00
Christian König
7351a4d3b1
Merge branch 'development' into development-v6
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 15:45:05 +02:00
Christian König
364537b324 Use env variable
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 15:15:49 +02:00
Christian König
b2c73f8325 Do not try to remove stale lables on PRs
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 15:15:49 +02:00
Christian König
f7b9d70054
Remove man page for pihole-FTL
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-30 21:39:10 +02:00
Adam Warner
6a45c6a8e0
v5.17.1 (#5295) 2023-05-30 19:27:52 +01:00
DL6ER
c1335c6852
Fix gravity adlist status not being updated (#5294) 2023-05-30 19:02:07 +02:00
DL6ER
6c302c9bc8
Adlist properties need to be stored in the new ("temp") database rather than the old.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-30 17:01:58 +02:00
yubiuser
fc67de8c19
Fix Faulty Regex pattern in custom DNS domain validation (#5291) 2023-05-29 09:13:33 +02:00
Adam Warner
494734bf27
Add in a test case
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-28 23:48:16 +01:00
Adam Warner
11679a5188
@MrDuck2742 dropped a ] on the floor without me seeing. I picked it up and put it back again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-28 23:31:51 +01:00
Adam Warner
aa9b4530c8
Sync master back into development (#5289) 2023-05-28 13:08:25 +01:00
Adam Warner
bea63f9d2d
Pi-hole v5.17 (#5288) 2023-05-28 12:01:25 +01:00
DL6ER
137e6dc184
Remove all the undocumented now useless stuff from pihole -a
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-28 09:01:02 +02:00
DL6ER
de5e6e4163
Add support for RISC-V 64-bit installs (#5196) 2023-05-28 07:44:06 +02:00
DL6ER
350c9e02ea
Add Ubuntu 23 to test suite (#5284) 2023-05-28 07:39:34 +02:00
yubiuser
f59610081e
remove outdated comments (#5227) 2023-05-27 22:41:11 +02:00
yubiuser
50d67dce73
Bump actions/setup-python from 4.6.0 to 4.6.1 (#5286) 2023-05-27 15:22:47 +02:00
yubiuser
43ba31f402
Bump pytest-testinfra from 8.0.0 to 8.1.0 in /test (#5287) 2023-05-27 14:45:28 +02:00
dependabot[bot]
3ae72114c7
Bump pytest-testinfra from 8.0.0 to 8.1.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/8.0.0...8.1.0)

---
updated-dependencies:
- dependency-name: pytest-testinfra
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-27 10:59:32 +00:00
dependabot[bot]
783f9e5569
Bump actions/setup-python from 4.6.0 to 4.6.1
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4.6.0...v4.6.1)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-27 10:56:41 +00:00
Christian König
b5800ef718
Remove getFTLAPIPort() function and fix pihole status
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:53:00 +01:00
Christian König
44bfb8ebf0
Remove the ability to reboot/shutdown via webpage.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:53:00 +01:00
Adam Warner
ea748822ef
REVISIT: I don't _think_ this line is nessacery. Why should gravity restart FTL if it is offline? It might be offline on purpose.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:53:00 +01:00
Adam Warner
c0e352094d
REVISIT: Remove some references to setupVars (some files can probably go entirely...)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
a91eb48d48
Remove some code from gravity that gets values from setupVars.conf / pihole-FTL.conf - use getFTLConfigValue from utils.sh instead
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
6b1c8a7fff
@DL6ER changed the config key names...
Remove superfluous test

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
7cbe713873
REVISIT: Don't rely on existence of setupVars.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
0e8f285f4f
Always assume that the web interface will be installed.
We could revist this again in future if we decide that there should still be a choice to install the interface or not

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
cd17040f95
setupVars.conf not existing is no longer a critical error
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
2784b267ec
pihole command: read values from pihole-FTL instead of setupvars.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
dbc6b814b2
Should not need to reloadDNS manually any more as FTL will detect that it needs to reload by itself
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
0568a69d83
Use WEBPORT instead of PRIVACY_LEVEL to set the web port...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Christian König
3cb3adc5ca
Fix setting webpassword via pihole -a -p
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:51:16 +01:00