Christian König
543708184f
Remove getFTLAPIPort() function and fix pihole status
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Christian König
c4cd94a5fd
Remove the ability to reboot/shutdown via webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Adam Warner
8823302214
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>
1 year ago
Adam Warner
05349765df
Remove extraneous empty lines in the list to be imported into gravity. Found when testing in an alpine docker container
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
f54aad3522
REVISIT: Remove some references to setupVars (some files can probably go entirely...)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
fd3194a714
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>
1 year ago
Adam Warner
2b72b9c7be
@DL6ER changed the config key names...
...
Remove superfluous test
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
40e6430950
REVISIT: Don't rely on existence of setupVars.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
05dfeb4fc1
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>
1 year ago
Adam Warner
42e675ef3d
setupVars.conf not existing is no longer a critical error
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
0f105edcdf
pihole command: read values from pihole-FTL instead of setupvars.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
e05031b3c0
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>
1 year ago
Adam Warner
4e7c77b11a
Use WEBPORT instead of PRIVACY_LEVEL to set the web port...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Christian König
71bfbfd198
Fix setting webpassword via pihole -a -p
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
DL6ER
0b92d985c1
Allow running pihole -g without root (run as user pihole)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
1 year ago
Adam Warner
5b75e40cb6
Remove the EPEL related tests on centos/fedora - no longer neccasery
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
0da216eacc
[REVISIT] Remove test_installPihole_fresh_install_readableBlockpage for now. We may be able to recylcle it later, but I have my doubts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
2351e028b2
Remove no longer required checks in test_installPihole_fresh_install_readableFiles
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
cbda36de83
[REVISIT] Remove test_setupVars_saved_to_file for now - it may no longer be needed as we move towards getting rid of the file.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
9d153b869c
No need for test_installPiholeWeb_fresh_install_no_errors
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
038320556e
Update comments on the move of /etc/dnsmasq.old -> /etc/dnsmasq.old to better reflect why we are doing it
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
f4a9d09e5b
Convert SetWebPassword to use new FTL config
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
d95ff956aa
add wrappers to utils.sh for setting FTL config & add tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
3719a63fce
Change when old configs are removed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
2b07ae2811
Remove some code that installs the blockpage/sets up web directories
...
Remove some code that disables dnsmasq if it is running
Create dnsmasq.d directory if it does not exist
1 year ago
Adam Warner
5852096cb5
Clear out some no longer needed ftl/dnsmasq config code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
51feff49a4
Needs tweaking, offer chance to change web interface port
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
d211ed0130
some more lighttpd refs (tests can come later)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
7159ad8258
gut the install script of references to web server/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
427857f9f1
Debug log does not need to check php/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
48e027d2db
Use ',' as the separator char in query rather than the default '|' as we now expect some valid results to contain '|'
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
ccd5d4f213
Remove lines starting with ! or [ to account for ABP style comments and header
...
Also splits the piped "one-liner" in ParseFileIntoDomains into individually commented commands (makes for easier reading and debugging)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Christian König
9d2a24146a
Simplify counting logic
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Christian König
ec7da071f3
Allow underscores
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Christian König
56d024581f
Use better regex and fix detection on non-domains
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Christian König
2325fa6f4b
Allow adding ABP style blocklists
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Dan Schaper
d75adb49f4
Use buildx to create docker test images ( #5178 )
1 year ago
Christian König
90da155053
Use buildx to create docker test images
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
yubiuser
2a61a03bdf
Don't use intermediate strings to filter false positives in gravity ( #5176 )
1 year ago
Christian König
a4bdf2454b
Don't use intermediate strings to filter false positives in gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
yubiuser
45cab12392
Bump tox from 4.4.4 to 4.4.5 in /test ( #5169 )
1 year ago
dependabot[bot]
5ecdfb53c2
Bump tox from 4.4.4 to 4.4.5 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.4.4 to 4.4.5.
- [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.4.4...4.4.5 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
1 year ago
Adam Warner
2d13cd2f1d
Bump tox from 4.3.5 to 4.4.4 in /test ( #5159 )
1 year ago
Adam Warner
788e7cc777
Add pihole-admin.conf to debug log ( #5144 )
1 year ago
Adam Warner
0ac89ac2e3
Only source versions file if the file exits ( #5157 )
1 year ago
dependabot[bot]
e5ea361b53
Bump tox from 4.3.5 to 4.4.4 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.3.5 to 4.4.4.
- [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.3.5...4.4.4 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
1 year ago
yubiuser
df0155abe1
Tweak old pihole lighttpd config warning message to better reflect it's usage ( #5154 )
1 year ago
Christian König
ca00ffa101
Only source versions file if the file exits
...
Signed-off-by: Christian König <ckoenig@posteo.de>
1 year ago
Adam Warner
3ad8965959
Tweak old pihole lighttpd config warning message to better reflect the consequences of making changes to the file
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
460f83580e
Sync master back into development ( #5151 )
1 year ago