arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity
5,654 Commits 9 Branches 109 Tags 20 MiB
b9a6970bfd
Commit Graph

1867 Commits

Author SHA1 Message Date
William Blew
b9a6970bfd
Fix addKey to handle substrings of existing keys 
Fix addKey to handle the case where a key is being added, and that key
is the leading substring of an already existing key within that file.

For example: add "server=192.168.1.1", when "server=192.168.1.178"
already exists within the /etc/dnsmasq.d/01-pihole.conf file.

Check pihole docker with PIHOLE_DNS="192.168.1.178;192.168.1.1". Its
/etc/dnsmasq/01-pihole.conf will be missing its second server= entry.

Add the test_key_addition_substr, to test addKey when
its adding a substring key of an existing key in the file.

Signed-off-by: William Blew <william@kulian.org>
 2023-03-17 11:50:52 -07:00
Dan Schaper
75a32d22a3
Allow limited parsing of ABP style adlists (#5179) 2023-03-14 13:23:03 -07:00
Christian König
71e262c37f
Revert "Allow final dot (root zone)" 
This reverts commit 0b5da9f0da.

Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-14 19:50:53 +01:00
Christian König
309ee78903
Use distinct variabled 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-07 20:40:16 +01:00
Christian König
d6f5552ccf
Convert domain to lowercase in pihole -q 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-03-06 21:52:54 +01:00
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
788e7cc777
Add pihole-admin.conf to debug log (#5144) 2023-02-09 18:35:02 +00: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
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
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
5f9523afa6
Change php socket path back to /run/lighttpd/ from /tmp (#5139) 2023-01-22 11:08:56 +00:00
yubiuser
d0affcb376
Cleanup if startup failed (#5052) 2023-01-22 09:30:17 +01: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
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
7bb86e4118
Add a check for the version number of lighttpd. Only remove the server.modules += section of the new pihole-admin config if the version number is not greater than or equal to 1.4.56 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-18 22:12:29 +00:00
Adam Warner
634e3b0e46
mod_accesslog was ommited from the list of server modules, which causes a warning to be flashed up in the error log. Enabling this 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-01-16 13:36:11 +00:00
Adam Warner
f27f796b34
Adjusting fastcgi.server config (#5103) 2023-01-14 18:04:25 +00:00
RD WebDesign
be8f25f8b8
Adding errorlog and accesslog options 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-01-14 14:44:27 -03:00
RD WebDesign
c85e4227cf
Remove duplicated fastcgi.server config 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-01-14 14:44:16 -03:00
Christian König
d349a4640f
Remoce leftover from query.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-01-12 20:24:08 +01:00
Christian König
9e47b61c8f
Apply suggestions from code review 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-01-03 21:20:22 +01:00
Glenn Strauss
34f45d011d
lighttpd: do not install obsolete 404 handler 
(/var/www/html/pihole/ dir and contents are still removed in uninstall)
(/var/www/html/index.lighttpd.orig is still removed in uninstall)

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 17:53:20 -05:00
Glenn Strauss
539f9d4da0
lighttpd: remove pihole block page error handler 
remove obsolete pihole block page error handler

x-ref:
  Remove the advanced functionality of the 404 page (Blockpage)
  https://github.com/pi-hole/pi-hole/pull/3910
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 17:53:14 -05:00
Glenn Strauss
c6342ed84c
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 16:19:03 -05:00
Glenn Strauss
0d5d3a1b22
lighttpd: remove obsolete exclusion of letsencrypt.conf 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 14:56:27 -05:00
Glenn Strauss
08c7691d1e
lighttpd pihole-admin.conf for admin interface 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-19 02:34:29 -05:00
Glenn Strauss
62bf9957dc
lighttpd conf: collect ^/admin/ conditions 
move a sub-condition to be a nested condition under ^/admin/

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-18 12:53:05 -05:00
Glenn Strauss
dafc9983f5
lighttpd include external.conf using file glob 
lighttpd 1.4.40 and later support 'include' using file glob

(The prior code for compatibility was presumably for Debian Jessie
 and earlier, now obsolete.  Debian Stretch -- currently oldstable --
 ships with lighttpd 1.4.45)

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
 2022-12-18 12:52:58 -05:00
Neill Wolf
d245226053
set X-XSS-Protection headers to 0 in lighttpd.conf 
Signed-off-by: Neill Wolf <neillawolf@gmail.com>
 2022-12-16 16:01:35 -06:00
Adam Warner
fc83883934
Apply suggestions from code review 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2022-12-11 17:48:45 +00:00
RD WebDesign
1550f29f06
Use GREEN if dig was successful 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:47 -03:00
RD WebDesign
a206980242
Fix parenthesis color 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:47 -03:00
RD WebDesign
8c2f56b0e6
Imporving the output from os_check() function 
- add red color to dig errors
- reorder some output lines
- add "Distro and version supported" on success

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:46 -03:00
RD WebDesign
b4349b41ce
Use the correct variable digReturnCode 
also use INFO instead of CROSS, because it's not an error.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:46 -03:00
RD WebDesign
67f04787d6
Only compare OS versions if dig was successful 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-12-11 14:42:35 -03:00
Christian König
f713b14ba0
Cleanup if startup failed 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-08 09:49:02 +01:00
Adam Warner
ff5ee29566
Add native systemd service (#4924) 2022-11-27 21:41:35 +00:00
Adam Warner
38775cffdf
Ensure local hash is always of length 8, for consistency. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 22:51:39 +00:00
Adam Warner
ba74051502
Grab local FTL hash correctly from FTL's own version output, and grab one digit less for remote hashes (also in debug log) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 22:09:26 +00:00
Adam Warner
cdbe4c9b86
Get only the precise tag number when getting local version, do not show branch name when on master branch(es) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 20:39:34 +00:00
Christian König
7536c312ee
Correctly identify process status in debug script on docker 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-11-13 21:53:59 +01:00
Adam Warner
a8b6eb9b70
Touch files before addKey or addOrEditKeyValPair (#4999) 2022-11-09 23:37:30 +00:00
Christian König
67385b7ed4
Touch files before addKey or addOrEditKeyValPair 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-11-09 21:25:09 +01:00
Adam Warner
64e61aac4a
Simplify versions.sh (#4959) 2022-11-09 17:15:51 +00:00
Dan Schaper
3491dbfd04
Check versions file on the debug log (#4977) 2022-10-31 13:25:15 -07:00
MichaIng
81927334f2
Add native systemd service 
Inspired by: https://github.com/pi-hole/pi-hole/pull/2112

A pre-start and a post-stop script are added to reduce doubled setup and cleanup code.

Since systemd services do not natively support dynamic users, test once whether capabilities are supported during install/update, and remove User=pihole otherwise.

Signed-off-by: MichaIng <micha@dietpi.com>
Co-authored-by: DL6ER <dl6er@dl6er.de>
 2022-10-30 19:40:33 +01:00
yubiuser
01bf9ca42a
Prevent CNAME loop (#4988) 2022-10-29 15:44:03 +02:00