6030 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dan Schaper	03c65dd0e9	Convert hardcoded /usr/local/bin to variable ... Update pihole script with full path to 'pihole' Variable for webpage.sh 'pihole' call. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-08-24 04:49:14 -07:00
DL6ER	6faddfcd3d	Print timestamps in local time zone of the Pi-hole. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-23 10:09:52 +02:00
DL6ER	1820c2c598	Merge branch 'development' into new/whitelist-regex-support ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 14:19:51 +02:00
DL6ER	23b688287f	Fix indentation in query.sh. No functional change in this commit. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 14:12:58 +02:00
DL6ER	42ccc1ef24	Add support for regex whitelist in "pihole -q". ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 14:06:42 +02:00
DL6ER	aef7892de6	Add missing hyphens. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 13:57:01 +02:00
DL6ER	cc40c18f49	Wrap upgrade script commands in a transaction. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 13:54:46 +02:00
DL6ER	b1838512b2	Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-22 13:39:58 +02:00
Dan Schaper	1c50caa8ca	Merge pull request #2882 from pi-hole/fix/FTL-latest-tag-not-found ... Fix error when getting latest FTL tag	2019-08-21 15:31:04 -07:00
Mcat12	febdbceab1	Fix error when getting latest FTL tag ... The headers containing the latest FTL tag were not properly input to the command (`<` vs `<<<`). This caused Bash to try and open the file named after the header string, which does not exist. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 10:03:54 -04:00
Mark Drobnak	597b4bfcca	Merge pull request #2873 from pi-hole/fix/pihole_restartdns ... Simplify restarting code for "pihole restartdns"	2019-08-21 08:57:44 -04:00
Dan Schaper	5c65006a66	Merge base branch changes ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-08-21 05:20:10 -07:00
David Haguenauer	34727c00c6	Drop indirection from install_dependent_packages ... Previously, install_dependent_packages would receive an array variable name as its single parameter, and would use variable indirection to access it; this change simplifies that function so that it instead receives the expanded array. Signed-off-by: David Haguenauer <ml@kurokatta.org>	2019-08-21 04:41:45 -07:00
Andreas Kurth	352146ef92	Fix pihole manpage to match code. ... The dry-run argument to pihole -up is "--check-only", not "--checkonly". Signed-off-by: Andreas Kurth <github@akurth.de>	2019-08-21 04:39:13 -07:00
Mcat12	b107ae2ab9	Use the filtered IPv6 OpenDNS servers ... The ones we were using previously were not filtered. See https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6- Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:39:10 -07:00
Mcat12	d5d1a607ad	Fix PKG_REMOVE array usage ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:39:07 -07:00
Mcat12	2594164772	Use an array for PKG_REMOVE ... Fixes shellcheck warning. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:39:05 -07:00
Mcat12	209555c42e	Fix uninstall causing 403 errors and not removing packages ... The 403 lighttpd errors were caused by removing the lighttpd config directory and not removing lighttpd itself. This caused a subsequent Pi-hole reinstall to not have all of the required lighttpd config files. The error while removing packages was caused by combining arguments into a string instead of listing each argument. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:39:01 -07:00
DL6ER	e27f50b8e5	Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-21 04:38:58 -07:00
DL6ER	484f618685	Use last PID in case pidof returns multiple PIDs for pihole-FTL ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-21 04:38:55 -07:00
Mcat12	da398c3d9c	Print an error message if the FTL release metadata download fails ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:38:51 -07:00
Mcat12	4e0ad52001	Fix ShellCheck issue by refactoring a bit ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:38:24 -07:00
Mcat12	c9829dd3e4	Fix pihole -up showing FTL update when network is down ... Fixes #1877 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-21 04:38:04 -07:00
Dan Schaper	35cf863f4b	Create FUNDING.yml ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-08-21 04:38:01 -07:00
Andreas	c53be459c6	quick fix for when dig also returns a CNAME ... Signed-off-by: Andreas <ryrun@online.de>	2019-08-21 04:37:06 -07:00
B. Olausson	ab1ea5a366	This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron. ... Signed-off-by: B. Olausson <contactme@olausson.de>	2019-08-20 14:48:03 -07:00
bcambl	97e11bd94e	ensure installation dependencies for FTL tests which rely on /etc/init.d ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2019-08-20 11:42:12 -07:00
bcambl	10de7f649b	add chkconfig to INSTALLER_DEPS (CentOS/Fedora) ... chkconfig is a dependency of spawn-fcgi which is a dependency of lighttpd which is installed via PIHOLE_WEB_DEPS in phase 2 adding chkconfig to INSTALLER_DEPS to ensure /etc/init.d is present during the installation prompts (phase 1) Signed-off-by: bcambl <blayne@blaynecampbell.com>	2019-08-20 11:42:09 -07:00
bcambl	d793ef1ab8	Merge conflict Fedora Dockerfile for tests pinned to 30 ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2019-08-20 11:40:18 -07:00
Jeroen Baert	d3d45a8776	Fix 404 error when browsing to pi.hole (without /admin) (for fedora) ... Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2019-08-20 11:29:20 -07:00
Jeroen Baert	9f86fd0cb4	Fix for 404 error when browsing to pi.hole (without /admin) ... Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>	2019-08-20 11:29:17 -07:00
Mcat12	71d5b42726	Remove the ZeusTracker blocklist from the defaults ... It is no longer served. Fixes #2843. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2019-08-20 11:05:06 -07:00
DL6ER	3e78ed95d4	Fix displaying options for table "group" in the debugger. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-17 15:04:04 +02:00
snapsl	20a839fef5	fixed local declaration before assignment ... Signed-off-by: snapsl <chris.baller@gmx.de>	2019-08-15 11:20:55 +02:00
snapsl	b2d8c4374b	tweaked code style of webpage.sh ... Signed-off-by: snapsl <chris.baller@gmx.de>	2019-08-14 23:28:13 +02:00
DL6ER	251c9fee98	Simplify restarting code for "pihole restartdns". This fixes #2869. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-14 21:14:55 +02:00
Mark Drobnak	9f77810ca8	Merge pull request #2774 from pi-hole/meta/funding ... Create FUNDING.yml	2019-08-12 10:30:33 -04:00
DL6ER	dc93462d42	Group table has only two columns ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-06 20:28:00 +02:00
DL6ER	4371c9ba03	Ensure proper permissions are set for gravity.db after creation. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:20:07 +02:00
DL6ER	6e2e825a5f	Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:10:52 +02:00
DL6ER	af754e3fc4	Rearrange group tables directly next to the tables they refer to. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:08:36 +02:00
DL6ER	06860ed5b4	Group tables have only two columns. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:07:39 +02:00
DL6ER	09190c1735	Only check once for if this is a regex list or not. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 21:03:47 +02:00
DL6ER	a95b473417	Rearranage if statements to ensure the proper output is shown for wildcard-style filters. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-08-05 20:56:01 +02:00
Mark Drobnak	56e3565a9e	Merge pull request #2865 from ryrun/patch-1 ... quick fix for when dig also returns a CNAME	2019-08-05 10:58:27 -04:00
Andreas	63230cb72d	quick fix for when dig also returns a CNAME ... Signed-off-by: ryrun <ryrun@online.de>	2019-08-04 21:21:08 +02:00
Mark Drobnak	f81e57d5b8	Merge pull request #2862 from bolausson/mybranch ... Check if TTY exist before we get screen size - Second PR try	2019-07-30 14:58:56 -04:00
B. Olausson	ecd6817aaf	This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron. ... Signed-off-by: B. Olausson <contactme@olausson.de>	2019-07-29 19:48:56 +01:00
DL6ER	6f58d58cae	Add --whitewild to help texts and man pages. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 22:26:27 +02:00
DL6ER	40d0caa70b	Add undocumented --whitewild option that does the same --wild does for the whitelist. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2019-07-22 21:15:28 +02:00