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
f7b9d70054
Remove man page for pihole-FTL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-30 21:39:10 +02: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
DL6ER
3695610300
Allow running pihole -g without root (run as user pihole)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-27 11:51:16 +01:00
Adam Warner
bf16fe4a37
Remove the EPEL related tests on centos/fedora - no longer neccasery
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
9bf372ef43
[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>
2023-05-27 11:51:16 +01:00
Adam Warner
414df5b372
Remove no longer required checks in test_installPihole_fresh_install_readableFiles
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
5e431210fd
[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>
2023-05-27 11:51:16 +01:00
Adam Warner
8f7c828407
No need for test_installPiholeWeb_fresh_install_no_errors
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
b8acccde90
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>
2023-05-27 11:51:16 +01:00
Adam Warner
019be067d9
Convert SetWebPassword to use new FTL config
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
632aead691
add wrappers to utils.sh for setting FTL config & add tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
e3ffec5762
Change when old configs are removed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
Adam Warner
0e558e4c36
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
2023-05-27 11:51:15 +01:00
Adam Warner
31f16510e2
Clear out some no longer needed ftl/dnsmasq config code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
Adam Warner
d2d1195928
Needs tweaking, offer chance to change web interface port
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
Adam Warner
c520b29326
some more lighttpd refs (tests can come later)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
Adam Warner
31ee15200d
gut the install script of references to web server/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
Adam Warner
9f31ab8a6f
Debug log does not need to check php/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00