Adam Warner
4148f2cb5b
tabs->spaces for editorconfig (Not sure how this has nto been caught before...)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-07-05 19:03:40 +01:00
DL6ER
3f7413d538
Add "-ni" to all sqlite3 invocations
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-09 23:07:35 +01:00
Adam Warner
71357ecae7
adminlte->web
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:12:02 +01:00
Christian König
afa688e3a0
Yu vs uh
...
(https://www.theguardian.com/guardian-observer-style-guide-r#:~:text=re/re%2D,re%2Dsign/resign )
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-07 00:21:06 +02:00
Christian König
edf0060acf
Fix spellcheck errors
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-06 22:26:08 +02:00
Christian König
843f57399c
Ignore ABP style entries in debug log dig test
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-09-07 22:27:49 +02: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
yubiuser
f59610081e
remove outdated comments ( #5227 )
2023-05-27 22:41:11 +02: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
19d50b9669
Don't source the install script in webpage.sh ( #5270 )
2023-05-10 19:55: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
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
ipitio
fa116389c2
remove old comments
...
Signed-off-by: ipitio <21136719+ipitio@users.noreply.github.com>
2023-03-23 01:23:35 +00:00
Adam Warner
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file"
2023-03-22 21:52:39 +00:00
Dan Schaper
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file ( #5177 )
2023-03-22 12:23:40 -07:00
RD WebDesign
66ed7c9ea3
Declaring all local variables under the function declaration line
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-21 16:34:50 -03:00
Adam Warner
ac2f13adef
Allow `pihole -q` to match subdomains using ABP style domains ( #5210 )
2023-03-21 15:39:11 +00:00
RD WebDesign
6b919f3a2e
Removing unnecessary commas
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-21 12:27:20 -03:00
William Blew
3c91b6558d
restore the addKey comment, reworded for anchors
...
Per @dschaper, restore the addKey clarifying comment. It has
been reworded to describe the use of anchors where before it
referenced using grep's 'match only an entire line' argument.
Signed-off-by: William Blew <william@kulian.org>
2023-03-17 11:50:53 -07:00
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
RD WebDesign
20f8c6af3c
Search for ABP entries only if they exist in gravity.db
...
and use `abp_domains` property.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-17 14:17:53 -03:00
RD WebDesign
c35ed68051
Allow `pihole -q` matching ABP subdomains
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-14 17:31:39 -03: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
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
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