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
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
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
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
4e0ad52001
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-08-21 04:38:24 -07:00
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
35cf863f4b
Create FUNDING.yml
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2019-08-21 04:38:01 -07:00
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
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
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
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
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
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
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
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
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
20a839fef5
fixed local declaration before assignment
...
Signed-off-by: snapsl <chris.baller@gmx.de >
2019-08-15 11:20:55 +02:00
b2d8c4374b
tweaked code style of webpage.sh
...
Signed-off-by: snapsl <chris.baller@gmx.de >
2019-08-14 23:28:13 +02:00
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
9f77810ca8
Merge pull request #2774 from pi-hole/meta/funding
...
Create FUNDING.yml
2019-08-12 10:30:33 -04:00
dc93462d42
Group table has only two columns
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-06 20:28:00 +02:00
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
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
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
06860ed5b4
Group tables have only two columns.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-05 21:07:39 +02:00
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
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
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
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
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
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
6f58d58cae
Add --whitewild to help texts and man pages.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 22:26:27 +02:00
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
0692be9bae
Fix small mistake in 2->3 upgrade script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 20:59:52 +02:00
0d28dce326
Print group table contents in debug log.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 20:18:15 +02:00
96031214c6
Add support for whitelist regex filter management via CLI.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-22 19:36:11 +02:00
3420439f31
Merge pull request #2820 from pi-hole/fix/ftl-update-no-network
...
Fix pihole -up showing FTL update when network is down
2019-07-20 14:55:48 -04:00
ab3f6dfcc6
Merge pull request #2831 from pi-hole/fix/block-page-adlists
...
Fix block page errors due to gravity DB and changes to queryAds
2019-07-20 14:55:37 -04:00
3ebd43ebf0
Remove outdated adlists.list check and fix empty adlists error message
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-19 17:39:00 -07:00
38ff343134
Print an error message if the FTL release metadata download fails
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-19 17:35:21 -07:00
6a8d3100d2
Merge pull request #2846 from pi-hole/fix/zeus-dead-adlist
...
Remove the ZeusTracker blocklist from the defaults
2019-07-18 13:43:57 -04:00
c3ec2e68ad
Remove the ZeusTracker blocklist from the defaults
...
It is no longer served. Fixes #2843 .
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-12 20:03:36 -07:00
bfe714e985
Merge pull request #2840 from pi-hole/fix/valid_ip-quote-error
...
Fix error when checking if IP address is valid
2019-07-11 23:06:39 -04:00
1d5755a4c2
Add tests for valid_ip
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-10 21:18:58 -07:00
445127accc
Merge pull request #2832 from pi-hole/new/audit_database
...
Migrate audit list to gravity.db database table
2019-07-10 22:55:48 -04:00
c156af020c
Use suggested array creation to fix linter error
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-07-10 19:52:17 -07:00
fa8751f9ad
Fix error when checking if IP address is valid
...
During install in `valid_ip`, we split up the IP address into octets to verify it is valid (each is <= 255).
This validation was broken in #2743 when a variable usage was quoted where it should have stayed unquoted:
```
./automated install/basic-install.sh: line 942: [[: 192.241.211.120: syntax error: invalid arithmetic operator (error token is ".241.211.120")
```
Due to this error, `127.0.0.1` would be used instead of the requested IP address. Also, this prevented the user from entering a custom DNS server as it would be marked as an invalid IP address.
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2019-07-10 19:42:51 -07:00
420f60b5c7
Add timeout to migration script (1->2).
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-10 12:02:07 +02:00
65fdbc85d5
Add timeout to migration script (2->3).
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-10 12:01:38 +02:00
87f75c737a
Review comments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-07-10 12:00:38 +02:00
