1794 commits

Author	SHA1	Message	Date
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