1445 commits

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