Pi-hole/pi-hole

mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00

Author	SHA1	Message	Date
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
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
Christian König	c8c6533440	Add small explanation. Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-29 15:09:14 +02:00
Dan Schaper	f1b15f7e92	Remove check for latest component version in debug log (#4973 )	2022-10-28 17:27:05 -07:00
DL6ER	e0c351f0e4	Remove unused possibility to obfuscate pihole.log in debug log (#4974 )	2022-10-28 13:16:30 -04:00
Christian König	128a3ab1be	Go POSIX Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-22 22:39:42 +02:00
Christian König	df3e9e5f51	Disable shellcheck as it suggests a bashism Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-22 22:25:40 +02:00
Christian König	c322458dcb	Escape dots in local DNS records/CNAMES before removing them Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-21 13:02:21 +02:00
Christian König	21be1bd58e	Prevent CNAME loop Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-20 07:29:14 +02:00
Christian König	4c9401175c	Remove check for latest version Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-15 09:06:57 +02:00
Christian König	235673dac8	Remove unused possibility to obfuscate pihole.log Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-15 08:58:12 +02:00
RD WebDesign	d737948f64	Add `versions` file to the REQUIRED_FILES list Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-10-14 14:11:19 -03:00
Christian König	52283478c8	Run pihole updatechecker if versions file is not found Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-14 13:26:06 +02:00
Christian König	c84be5de61	Reorganize by component rather then source Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-14 13:18:12 +02:00
Christian König	d85982dc51	Use versions file instead of github api to get latest version Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-14 10:29:14 +02:00
Christian König	5c61f6cb65	Remove checkout hint Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-14 08:43:39 +02:00
Christian König	4c0a94d2b9	Don't rely on pihole -v output but query github to get the lastest versions in debug script Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-13 14:44:13 +02:00
Christian König	9471c69882	Fix spelling Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-07 09:34:05 +02:00
Christian König	79c0b446e1	Set missing data to N/A Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 21:55:49 +02:00
Christian König	a478f2460b	POSIX Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 21:50:07 +02:00
Christian König	2dc599f266	Simplify version.sh Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 17:58:58 +02:00
Christian König	d7f7ef9965	Only create VERSION_FILE if it does not exist Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 14:37:56 +02:00
Christian König	888e44e53d	Add hash functions to updatecheck Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 14:34:34 +02:00
Christian König	18d28533eb	Update local and remote versions at the same time Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 12:36:17 +02:00
Christian König	56527e5dd9	Add get_remote_version() to updatechecker Signed-off-by: Christian König <ckoenig@posteo.de>	2022-10-06 12:03:12 +02:00
Adam Warner	997a771dc8	Fix Deepsource.io warning message for index.php file (#4953 )	2022-10-01 22:57:32 +01:00
Adam Warner	b7b5ffa8dd	remove old code per review from @yubiuser and @dschaper Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-10-01 22:31:03 +01:00
Adam Warner	34b66002e9	`leasetime` (local) should have an `h` after it to signify 24h lease, else it will be read as two minutes (minimum integer value) Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-10-01 22:31:00 +01:00
RD WebDesign	d48c557134	Fix Deepsource warning message for index.php file Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-09-30 17:13:08 -03:00
Christian König	276c480f50	Return default port if non-numeric characters are set in pihole-FTL.conf for FTLPORT. FTL does the same in such case and provide the API on 4711 Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-26 23:40:09 +02:00
Christian König	25ba68104b	Remove last traces Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-26 22:55:34 +02:00
Christian König	3d01e4d0cf	No detour - use pihole-FTL.conf to get the API port number Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-26 22:55:30 +02:00
Dan Schaper	f8a12917e2	Handle more than one default gateway in debug script (#4934 )	2022-09-25 11:09:26 -07:00
Dan Schaper	37b45d411d	Read docker tag from file in root, not the previously set environment variable (#4929 )	2022-09-25 11:05:08 -07:00
Christian König	22ebf21487	Use POSIX Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-25 18:20:01 +02:00
Adam Warner	9debd22179	If, after reading /pihole.docker.tag into DOCKER_TAG, it does not match an expected pattern, unset it - this should prevent arbitary code from being run Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-25 15:51:09 +01:00
Peter Russell	951b4ed002	Remove cronjob that checks local versions every 10 minutes - only check when required (#4939 ) * eliminate updatechecker local from pihole cron job Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * resolving stickler-ci items Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * undo changes to updatecheck.sh (request from PromoFaux) Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * applied recommendation from PromoFaux Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * Indent the code inside the function Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * removed unnecessary updatecheck for core Signed-off-by: jpgpi250 <jpgpi250@gmail.com> * eliminate updatechecker local from pihole cron job Co-authored-by: jpgpi250 <jpgpi250@gmail.com> Signed-off-by: Adam Warner <me@adamwarner.co.uk> Signed-off-by: jpgpi250 <jpgpi250@gmail.com> Signed-off-by: Adam Warner <me@adamwarner.co.uk> Co-authored-by: Adam Warner <me@adamwarner.co.uk>	2022-09-24 16:14:44 +01:00
Adam Warner	1c1407e083	Use utils.sh in install script (#4872 )	2022-09-24 14:00:22 +01:00
Adam Warner	9463c3c69f	Change wording in chronometer (#4910 )	2022-09-24 13:53:08 +01:00
Christian König	bb57a9e616	Handle more than one default gateway in debug script Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-22 22:33:11 +02:00
Adam Warner	b6d1bd7335	Read docker tag from file in root, not the previously set environment variable Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-19 22:01:05 +01:00
Christian König	60c35cb93c	Remove unused check_database_integrity() Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-18 13:08:44 +02:00
Christian König	2c3fea321b	Remove FAQ_ULA as it is unused in `core` Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-18 09:10:24 +02:00
Christian König	40f00c6f0b	Fix gravity database integrity check Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-18 09:01:22 +02:00

1 2 3 4 5 ...

1925 commits