Adam Warner
c5faf3d174
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>
2023-02-22 21:21:38 +01:00
Adam Warner
1f3f849106
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>
2023-02-22 21:21:38 +01:00
Christian König
ca74152d1d
Allow adding ABP style blocklists
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-22 21:21:13 +01:00
Christian König
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file
...
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-21 21:03:55 +01:00
Adam Warner
b9f19fc357
Sync master back into development ( #5166 )
2023-02-21 20:03:27 +00:00
Dan Schaper
2380359270
Bump pytest-xdist from 3.1.0 to 3.2.0 in /test ( #5170 )
2023-02-21 11:40:13 -08:00
Dan Schaper
d75adb49f4
Use buildx to create docker test images ( #5178 )
2023-02-16 13:55:00 -08:00
Christian König
90da155053
Use buildx to create docker test images
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-16 21:43:30 +01:00
yubiuser
2a61a03bdf
Don't use intermediate strings to filter false positives in gravity ( #5176 )
2023-02-16 19:02:43 +01:00
Christian König
a4bdf2454b
Don't use intermediate strings to filter false positives in gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-16 10:39:21 +01:00
Christian König
4b503a080b
Revert "Use new worksteal distribution algorithm"
...
This reverts commit 46fe37b4da
2023-02-14 22:14:29 +01:00
Christian König
46fe37b4da
Use new worksteal distribution algorithm
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-14 21:12:12 +01:00
dependabot[bot]
d6275cdd7c
Bump pytest-xdist from 3.1.0 to 3.2.0 in /test
...
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist ) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases )
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.1.0...v3.2.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-02-13 09:04:19 +00:00
yubiuser
45cab12392
Bump tox from 4.4.4 to 4.4.5 in /test ( #5169 )
2023-02-13 10:01:34 +01:00
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>
2023-02-11 10:57:20 +00:00
Adam Warner
d86b325dfe
Only search for "OVERWRITTEN BY PI-HOLE" when checking inside lighttpd.conf ( #5167 )
2023-02-10 20:57:03 +00:00
Adam Warner
c65ea9c47c
Adam does not always think things through completly. He will go and sit on the naughty step now.
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 20:49:58 +00:00
Adam Warner
741717aa38
Pi-hole core v5.15.4 ( #5165 )
2023-02-10 18:59:18 +00:00
Adam Warner
2d13cd2f1d
Bump tox from 4.3.5 to 4.4.4 in /test ( #5159 )
2023-02-09 18:35:28 +00:00
Adam Warner
788e7cc777
Add pihole-admin.conf to debug log ( #5144 )
2023-02-09 18:35:02 +00:00
Adam Warner
0ac89ac2e3
Only source versions file if the file exits ( #5157 )
2023-02-09 18:34:09 +00:00
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>
2023-02-04 10:01:16 +00:00
yubiuser
df0155abe1
Tweak old pihole lighttpd config warning message to better reflect it's usage ( #5154 )
2023-02-03 00:37:28 +01:00
Christian König
ca00ffa101
Only source versions file if the file exits
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-02 11:58:58 +01:00
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>
2023-02-01 17:38:21 +00:00
Adam Warner
460f83580e
Sync master back into development ( #5151 )
2023-01-25 21:33:39 +00:00
Adam Warner
c7ad7113d7
Hotfix v5.15.3 ( #5150 )
2023-01-25 21:25:30 +00:00
Adam Warner
0a6ebadb52
Change lighttpd options min_procs value to 1 ( #5149 )
2023-01-25 18:43:32 +00:00
RD WebDesign
b9e401aaa3
Change min_procs value to 1
...
The original configuration used the default `min_procs=<max_procs_value>`.
A recent change set this value to zero, but a lot of systems started to
receive error messages about the socket file and in some systems lighttpd
wasn't able to restart the PHP process, returning HTTP error 503.
Setting this to 1 fixed those errors.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-25 14:35:57 -03:00
Christian König
18ab94135f
Show all files (not their content) of the lighttpd config dirs
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-24 23:02:38 +01:00
Christian König
be0efa2332
Add lighttpd selftest
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-24 22:19:24 +01:00
Christian König
9bde5de601
Use conf-enabled instead of conf-available
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-24 21:59:13 +01:00
Adam Warner
db42ed1e4f
Sync master back into development ( #5148 )
2023-01-23 18:18:22 +00:00
Adam Warner
262ffe458b
Hotfix release ( #5147 )
2023-01-23 17:17:16 +00:00
Christian König
e59f5db145
Add pihole-admin.conf to debug log
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-22 22:37:19 +01:00
Adam Warner
362c604744
Ensure that the directory /run/lighttpd exists, and that it is owned by www-data ( #5143 )
2023-01-22 19:19:19 +00:00
Adam Warner
68a03cc877
Ensure that /run/lighttpd exists and is owned by lighttpd user. It is likely that new installs will fail currently
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-22 18:05:05 +00:00
Adam Warner
671da760d3
Sync master back into development ( #5142 )
2023-01-22 17:15:05 +00:00
Adam Warner
3c3d913934
v5.15.1 ( #5141 )
2023-01-22 17:08:16 +00:00
Adam Warner
50be36400c
Always set lighttpd config dir permissions ( #5038 )
2023-01-22 15:56:29 +00:00
Adam Warner
5f9523afa6
Change php socket path back to /run/lighttpd/ from /tmp ( #5139 )
2023-01-22 11:08:56 +00:00
Adam Warner
81a31b9e7b
Reduce number of false positives when gravity unable to import domains - change the wording of the output ( #5128 )
2023-01-22 11:06:45 +00:00
yubiuser
d0affcb376
Cleanup if startup failed ( #5052 )
2023-01-22 09:30:17 +01:00
Adam Warner
9939cf1d77
Rename some of the variables to hopefully make the process a little clearer
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-21 23:57:49 +00:00
Adam Warner
ce7f926e92
Only remove the server.modules+= from new config if lighttpd version is < 1.4.56 ( #5133 )
2023-01-21 23:26:11 +00:00
Adam Warner
6b4f77bdfe
change socket path back to /run/lighttpd/* - possibly causing issues https://github.com/pi-hole/pi-hole/issues/5131
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-21 17:42:32 +00:00
Adam Warner
267792aa1e
Bump tox from 4.2.8 to 4.3.5 in /test ( #5138 )
2023-01-21 15:53:48 +00:00
Adam Warner
9331cbff4b
remove the access log configuration from lighttpd.conf.debian and .conf.fedora to prevent issues on upgrades (this is defined in pihole-admin.conf)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-21 14:25:06 +00:00
Adam Warner
d30a5f1b95
Get the lighttpd version from dpkg-query instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-21 13:53:56 +00:00
dependabot[bot]
d6e25403ee
Bump tox from 4.2.8 to 4.3.5 in /test
...
Bumps [tox](https://github.com/tox-dev/tox ) from 4.2.8 to 4.3.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.2.8...4.3.5 )
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-21 10:01:41 +00:00
