2010 commits

Author	SHA1	Message	Date
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
Christian König	00e51f32b5	Blcked => Block ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-17 16:46:31 +02:00
Christian König	f90fb8b946	Change wording in chronometer ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-17 16:24:31 +02:00
yubiuser	2ff1fa1b85	Merge branch 'development' into use_utils	2022-09-17 16:14:31 +02:00
Christian König	7e6f81f814	Add comment in lighttpd.conf how to change the server port ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-09-17 12:00:33 +02:00
RD WebDesign	5cc317de5b	Change texts after Block Page removal ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-09-16 03:16:54 -03:00
Adam Warner	3d53bda121	Update advanced/Scripts/updatecheck.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de> Signed-off-by: Adam Warner <github@adamwarner.co.uk>	2022-09-15 17:54:54 +01:00
Adam Warner	760325eb76	Update piholeDebug to source versions file for DOCKER_VERSION instead of reading PIHOLE_DOCKER_TAG ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-14 22:49:37 +01:00
Adam Warner	bf256aa5a7	If docker version env var is set, store it in /etc/pihole/versions file for later use ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-09-14 22:38:41 +01:00
Christian König	49b9dc8888	Remove json_extract function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-25 09:55:47 +02:00
Christian König	9b5ea13a33	Use utils.sh in install script ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-24 08:49:20 +02:00
yubiuser	66eeee5548	Remove the email function (#4870) ... - **What does this PR aim to accomplish?:** We offered to set an administrator email which was shown on the blockpage. With the removal of the blockpage (https://github.com/pi-hole/pi-hole/pull/3910) this function is not needed anymore. Corresponding web interface PR: https://github.com/pi-hole/AdminLTE/pull/2301	2022-08-24 07:21:04 +02:00
Adam Warner	a4b899c256	Review suggestions (and shellcheck complaints) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-23 19:10:12 +01:00
Adam Warner	5421aad03e	Store versions as key/value pairs rather than space delimeted values ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-22 19:11:27 +01:00
Christian König	eeccfb27f8	Remove it also from index.php together with more unused variables ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-20 23:07:38 +02:00
yubiuser	4cf3280500	Merge pull request #4862 from pi-hole/tweak/lighttpd_headers ... Add security-related headers to Pi-hole web interface	2022-08-18 13:37:28 +02:00
Christian König	8c4a9aa6e3	Remove the email function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-17 23:14:56 +02:00
Adam Warner	114f562758	Merge branch 'development' into removeblockpagefunctionality	2022-08-17 20:25:03 +01:00
Adam Warner	e35a9da921	Remove the blockpage-focussed customisations to query.sh ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 18:57:55 +01:00
yubiuser	c67f313ee8	Apply reviewers suggestion for inline CSS ... Co-authored-by: RD WebDesign <github@rdwebdesign.com.br> Signed-off-by: yubiuser <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
Christian König	49a9f6f2db	Reproduce blockpage.css for $splashPage ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
Christian König	e6683803ed	Use absolut asset paths ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:21:29 +01:00
Christian König	b98e331375	Only do one curl call in debug when checking the X-Header ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:20:41 +01:00
Christian König	6c9bd7a632	Remove blockingpage.css ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 17:20:13 +01:00
Adam Warner	5d5a85b7b6	X-Pi-hole removed from blocking page... ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 17:12:16 +01:00
Adam Warner	c78cf82fc6	no need to declare $viewPort ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-08 17:12:09 +01:00
Christian König	d77677312c	Extend FTL information in debug log ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-08 13:52:20 +02:00
DL6ER	f418481b9f	Add security-related headers to Pi-hole web interface ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-08-06 15:35:01 +02:00
Dan Schaper	989c52ef24	Exit with return code if ftl does not start ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-08-04 17:20:39 -07:00
Christian König	3327df8d9c	Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startup ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-08-04 14:47:43 +02:00
Adam Warner	0b81dd387b	type -> list_type per @yubiuser suggestion ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-01 20:56:37 +01:00
yubiuser	aa0a9e2976	Merge pull request #4839 from pi-hole/move_getFTLPIDFile ... Move FTL port and PID functions to utils.sh	2022-07-30 21:01:21 +02:00
Christian König	567a915336	Remove unused and outdated files and scripts ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-29 23:21:38 +02:00
Christian König	7b77d991df	Move FTL port and PID functions to utils.sh ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-26 14:38:03 +02:00
RD WebDesign	d89720330f	Address revision requests: ... - replace `local var` with `_var` (POSIX style); - move inline comments Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-07-24 20:15:20 -03:00
RD WebDesign	8d1f286f30	Only execute spinner function if there is a tty ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-07-24 17:52:17 -03:00
RD WebDesign	cbcd12631d	Adding the spinner for foreign_key_check too ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-07-11 01:53:30 -03:00
RD WebDesign	c4f9a475f3	Debug log - add spinner for long processes ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-07-11 01:34:51 -03:00
Christian König	b486786041	Add database healthy checks to debug script ... Fix health check output comparison in gravity script as well Add note about waiting time Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-10 23:32:47 +02:00
yubiuser	8e4adb6e39	Merge pull request #4788 from pi-hole/SKIP_INSTALL ... Rename PH_TEST to SKIP_INSTALL	2022-07-09 00:01:48 +02:00
Christian König	b49db58ec2	Fix spelling mistakes ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-08 22:00:36 +02:00
Christian König	518cbd10e0	Rename also in docker files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-06 22:58:14 +02:00
Christian König	0a8761ee68	Rename PH_TEST to SKIP_INSTALL ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-06 22:53:09 +02:00
Christian König	469776afd6	Do not restrict RegEx added from CLI by length ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-06 19:27:33 +02:00
DL6ER	98c238064e	Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-07-03 18:43:45 +02:00
Adam Warner	0be987239e	Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-07-02 14:04:08 +01:00
Christian König	73d5902bed	Add editorconfig-checker workflow ... Add yml style to editorconfig Add markdown styling to editorconfig Signed-off-by: Christian König <ckoenig@posteo.de>	2022-07-02 09:36:52 +02:00
Dan Schaper	dcea3cf2c6	Merge branch 'development' into drop_fedora	2022-06-27 11:48:26 -07:00
Christian König	f9d1893f96	Update test to reflect currently supported OS ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-06-20 10:34:32 +02:00
Christian König	954a0c2a14	Remove read permission for others on senible log files ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-06-19 23:09:05 +02:00
Dan Schaper	67f5f16f84	Merge branch 'development' into fix-ipv6	2022-06-02 12:24:01 -07:00
yubiuser	ae9d16baf2	Merge pull request #3732 from pi-hole/tweak/moveloglocation ... Utilise /var/log/pihole/ for log storage	2022-05-31 22:59:32 +02:00
Christian König	300c7b1518	Do not hardcode webroot dir for teleporter ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-31 14:11:39 +02:00
Christian König	dae96e7384	Change lighttpd log file names ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-29 21:04:18 +02:00
yubiuser	3fa8f76d99	Combine mkdir in service file ... Co-authored-by: MichaIng <micha@dietpi.com>	2022-05-29 16:15:18 +02:00
Christian König	52c3df1a8e	lighttpd log dir is now different than Pi-hole log dir ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-28 21:21:48 +02:00
Christian König	ce8731b746	no-dereference ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-18 22:19:19 +02:00
Christian König	08faf21b2e	Set file owner and permission to symlinks ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-18 22:06:36 +02:00
Christian König	2dd08f070e	Fix copy&paste error ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-15 23:30:02 +02:00
Christian König	0961103933	Add backward compatibility to FTL service by creating symlinks ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-05-15 22:10:40 +02:00
Adam Warner	82695aba7d	update LOG_DIRECTORY variable in debug script ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-05-15 07:09:27 +02:00
Adam Warner	36dd533ef3	use directory /var/log/pihole/ for log storage ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-05-15 06:46:23 +02:00
yubiuser	0decc1252b	Respect user configurable path for pid and port file in pihole-FTL.service (#4680) ... * Use pid file in pihole-FTL.service Signed-off-by: Christian König <ckoenig@posteo.de> Co-authored-by: MichaIng <micha@dietpi.com>	2022-05-11 16:03:44 -07:00
Omoeba	f7c800863e	Remove DHCPv6, use leasetime from interface (#4507) ... Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>	2022-05-11 11:57:42 -07:00
Adam Warner	d78c689e55	no more alphabetical order ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-04-21 19:56:21 +01:00
Adam Warner	c9e76c978e	Update advanced/Scripts/webpage.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de>	2022-04-17 13:39:55 +01:00
Adam Warner	23e6fa1ec5	Replace wrapper function calls with direct utils.sh calls. Leave warpper functions until next release as docker currently uses them, and new changes to utils.sh need to be in the master branch before docker can use them ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-04-15 09:50:40 +01:00
Adam Warner	db116971ce	I tried to do too many things in one function, vastly overcomplicating what should have been _this_ all along ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-04-14 22:53:38 +01:00
Adam Warner	86dd612882	remove readonly directive from declaration of utilsfile, it is unnecassery ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-04-12 17:13:50 +01:00
yubiuser	d3e94cbceb	Merge pull request #4653 from pi-hole/refactor-utils-redux ... Tweaks to functions in utils.sh and refactored usages in webpage.sh	2022-04-04 23:25:54 +02:00
yubiuser	9b4f6c84cd	Minor review comments	2022-04-04 23:14:10 +02:00
Adam Warner	4d31d5ee11	Address review comments ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-04-04 22:02:26 +01:00
Christian König	e4a1f3a175	Rename block lists to adlists within the query list functions ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-04-04 13:52:26 +02:00
Adam Warner	0d74b27101	Merge pull request #4646 from pi-hole/tweak/debug_message ... Pool identical messages in debug output	2022-04-02 13:14:44 +01:00
Adam Warner	7fa8cdd03e	Address: ... - Review Comments - Stickler Complaints	2022-04-02 12:46:07 +01:00
Adam Warner	fe9031b26f	Merge pull request #4669 from pi-hole/master ... sync: master to development	2022-04-02 00:05:49 +01:00
Dan Schaper	b714c4598a	Found it. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-04-01 14:49:30 -07:00
Dan Schaper	0f192998eb	Create empty files. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-04-01 14:17:57 -07:00
Dan Schaper	8a5c7dec71	Ensure existing files are proper owner and mode. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> co-authored-by: RD WebDesign <github@rdwebdesign.com.br>	2022-04-01 14:08:09 -07:00
RD WebDesign	5cebceadda	Remove @ and following character from interface name ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-30 21:32:18 -03:00
RD WebDesign	f8e84b3c3f	Fix stickler ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-23 18:45:18 -03:00
RD WebDesign	c9809371ab	Selecting the protocol ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-23 18:33:15 -03:00
RD WebDesign	0d4c69cc6f	Add check to avoid error in PHP 8 ... and return some information about the unexpected value Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-21 18:59:46 -03:00
Adam Warner	59fc3804be	Make utils.sh posix compatible per request ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-03-16 20:40:25 +00:00
Adam Warner	48138d32b6	Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit) ... Add a removeKey function with test update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further) Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-03-16 17:42:01 +00:00
RD WebDesign	ab7d83384f	Allow lighttpd to stream responses to browser ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-15 15:33:56 -03:00
Christian König	48136c5bbc	Add last timestamp ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-03-14 19:54:46 +01:00
Christian König	0219e5dfe0	Pool identical messages in debug output ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-03-12 21:00:48 +01:00
Adam Warner	0631cb4984	Merge pull request #4645 from rdwebdesign/color_debug_web ... Generate colorful debug logs to web interface	2022-03-12 18:02:49 +00:00
RD WebDesign	40b96e673b	Allows colorful debug logs via web interface ... Note: needs the AdminLTE code changes to work. Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-12 02:58:46 -03:00
Christian König	42424b515b	Add getFTLAPIPort function ... Add ftl_api_port function Signed-off-by: Christian König <ckoenig@posteo.de> Use getFTLAPIPort in pihole Signed-off-by: Christian König <ckoenig@posteo.de> Use default portfile as fallback Signed-off-by: Christian König <ckoenig@posteo.de> Fix stickler Signed-off-by: Christian König <ckoenig@posteo.de> Correct variables Signed-off-by: Christian König <ckoenig@posteo.de> Apply suggestions from code review Co-authored-by: DL6ER <DL6ER@users.noreply.github.com> Add test getFTLAPIPort returing default port Signed-off-by: Christian König <ckoenig@posteo.de> Remove unused code from test_key_val_replacement_works Signed-off-by: Christian König <ckoenig@posteo.de> Add getFTLAPIPort_custom test Signed-off-by: Christian König <ckoenig@posteo.de> Fix output format Signed-off-by: Christian König <ckoenig@posteo.de> Add debugging Signed-off-by: Christian König <ckoenig@posteo.de> Remove debugging and fix function Signed-off-by: Christian König <ckoenig@posteo.de>	2022-02-27 18:16:53 +01:00
DL6ER	91b4233d3a	Add backend option to set rate-limit from the dashboard ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-02-19 14:46:32 +01:00
Christian König	f4286a4d12	Fix log flush with new query database schema ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-02-12 23:33:19 +01:00
Adam Warner	08999bf315	Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-02-04 21:16:02 +00:00
Adam Warner	2bd670a3dd	Merge pull request #4582 from lschloetterer/patch-1 ... add parameter to set filename for teleporter	2022-02-04 20:44:49 +00:00
Lukas Schlötterer	2a0bb5b9ee	Create second entry for teleporter and adjust spacing ... Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2022-02-04 21:29:23 +01:00
DL6ER	844c4dcdc8	Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3 ... Replace calls to sqlite3 by calls to pihole-FTL sqlite3	2022-02-03 05:45:04 +01:00
Lukas Schlötterer	881d92632c	add hint for custom teleporter filename to help function ... Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2022-02-01 09:41:57 +01:00
DL6ER	76d4e1209f	Merge pull request #4585 from pi-hole/tweak/sed-add-if-not-exists ... Replace value for BLOCKING_ENABLED, add if it does not already exist	2022-02-01 07:45:34 +01:00
Adam Warner	77e5121d43	Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-30 23:05:28 +00:00
DL6ER	74d7d10554	Orphans need to be deleted in the old database ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-30 21:09:24 +01:00
DL6ER	8cbffa179d	Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-30 11:18:17 +01:00
DL6ER	5bb79de70b	Clean possible leftovers in domainlist_by_group, adlist_by_group, and client_by_group before copying from database base to avoid foreign key violations. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-30 10:38:24 +01:00
Lukas Schlötterer	bad6d8a59e	add parameter to set filename for teleporter ... Make it possible to write pihole -a -t myname.tar.gz to configure the filename however you want Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>	2022-01-28 16:26:57 +01:00
Christian König	7aa28e4a3a	Do a full fetch ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-22 22:09:15 +01:00
RD WebDesign	6ead24b315	Move space into variable (#4562) ... Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>	2022-01-14 17:00:34 +01:00
DL6ER	ec3a5c2989	Merge pull request #4543 from pi-hole/tweak/debug_ipaddr ... Include ip addr show and ip route show in debug log	2022-01-09 12:53:37 +01:00
DL6ER	b20b38d44f	Include ip addr show and ip route show for us to help with local-service issues (where hops-away is measured) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-09 12:38:22 +01:00
Christian König	a65a841c56	Remove oneline from ss call ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-09 07:13:51 +01:00
Adam Warner	3097c8fbdc	Skip the required ports check if installed in docker container. Unpriv'ed containers do not have access to the information required to resolve the service name listening - and the container should not start if there was a port conflict anyway (#4536) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-08 13:57:49 +01:00
Christian König	81698ef1ed	Fix Pi-hole status in chronometer ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-05 21:09:57 +01:00
DL6ER	5823f5e254	Use ss instead of lsof (#4518) ... * Use ss instead of lsof for pihole status checks Signed-off-by: DL6ER <dl6er@dl6er.de> * Use ss FILTER instead of piping into bash Signed-off-by: DL6ER <dl6er@dl6er.de> * Use ss in debug log generation Signed-off-by: DL6ER <dl6er@dl6er.de> * Remove lsof from dependencies Signed-off-by: DL6ER <dl6er@dl6er.de>	2022-01-05 16:41:46 +00:00
Adam Warner	7807a93e10	If PIHOLE_DOCKER_TAG is set, then include that info in the debug run (#4515) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-01-04 21:46:06 +00:00
yubiuser	c6a2a6f739	Install pihole-FTL.conf template on fresh installation (#4496) ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-01-04 19:09:30 +00:00
yubiuser	241e53ed45	Skip debug upload question if called from web interface (#4494) ... * Skip debug upload question if called from web interface Signed-off-by: Christian König <ckoenig@posteo.de> * Suppress upload error if users opt-out from uploading from web interface Signed-off-by: Christian König <ckoenig@posteo.de> * Fix and reverse logic Signed-off-by: Christian König <ckoenig@posteo.de> * Remove addtional space Signed-off-by: Christian König <ckoenig@posteo.de> * Include reviewer's comment :D Co-authored-by: Adam Warner <me@adamwarner.co.uk> Co-authored-by: Adam Warner <me@adamwarner.co.uk>	2022-01-04 19:06:41 +00:00
Omoeba	5b84cd0a61	Fix IPv6 support when Pi-hole is a router ... Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>	2022-01-03 04:02:01 -08:00