Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-25 15:43:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
5763 commits 9 branches 109 tags 27 MiB
Commit graph

5763 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
DL6ER
23f2db01bb
Use list parsing functionality of FTL (#5275) 2023-05-27 12:48:26 +02:00
Adam Warner
82b60b09d4
Fix issue with Adding Local DNS Records does not add to /etc/pihole/custom.list when using grep 3.10 (#5269) 2023-05-27 11:28:19 +01:00
DL6ER
c92826c152
Do not copy info table during pihole -g 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-05-24 21:32:34 +02:00
yubiuser
85e7fc5a0e
Bump pytest-testinfra from 7.0.0 to 8.0.0 in /test (#5279) 2023-05-20 17:05:33 +02:00
dependabot[bot]
10fe85933b
Bump pytest-testinfra from 7.0.0 to 8.0.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 7.0.0 to 8.0.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/7.0.0...8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-20 13:41:46 +00:00
yubiuser
412079a798
Bump pytest-xdist from 3.3.0 to 3.3.1 in /test (#5278) 2023-05-20 15:41:00 +02:00
dependabot[bot]
f9b29cfb62
Bump pytest-xdist from 3.3.0 to 3.3.1 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.3.0 to 3.3.1.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.0...v3.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-20 11:02:15 +00:00
DL6ER
73733308ba
Use parseList function offered by pihole-FTL 2023-05-15 19:25:56 +02:00
yubiuser
614554f26f
Bump pytest-xdist from 3.2.1 to 3.3.0 in /test (#5274) 2023-05-13 14:01:05 +02:00
dependabot[bot]
8d91ca874b
Bump pytest-xdist from 3.2.1 to 3.3.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.2.1 to 3.3.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.2.1...v3.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-13 11:01:21 +00:00
yubiuser
b075e25ab9
Remove forgotten variables (#5273) 2023-05-12 09:56:33 +02:00
Christian König
eaded9fdb1
Remove forgotten variables 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-11 22:16:21 +02:00
yubiuser
19d50b9669
Don't source the install script in webpage.sh (#5270) 2023-05-10 19:55:51 +02:00
yubiuser
8e5467de70
Remove unused code from query.sh (#5266) 2023-05-10 19:54:57 +02:00
yubiuser
fe1618d697
Don't use '--suffix' in mktemp (#5272) 2023-05-10 08:07:59 +02:00
Christian König
a3e610dbf2
Don't use '--suffix' in mktemp 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-10 06:52:51 +02:00
MrDuck2742
b8c3f6d999
Adding Local DNS Records does not add to /etc/pihole/custom.list 
Fixes #5268

Signed-off-by: MrDuck2742 <jim@datachord.co.uk>
 2023-05-08 04:41:53 +01:00
Christian König
e6ae2e98cc
Don't source the install script in webpage.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-07 13:21:23 +02:00
Adam Warner
654e111038
Sync master back into development (#5221) 2023-05-06 11:14:50 +01:00
yubiuser
cd638b102f
Filter ABP CSS selectors (#5247) 2023-05-04 12:01:20 +02:00
Christian König
fd4e8766e4
Remove unused code from query.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-05-02 22:50:51 +02:00
yubiuser
c95d34389b
Bump tox from 4.4.12 to 4.5.1 in /test (#5264) 2023-04-29 18:33:35 +02:00
dependabot[bot]
83afff953f
Bump tox from 4.4.12 to 4.5.1 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.12 to 4.5.1.
- [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.12...4.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-29 10:57:31 +00:00