Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-04 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
6447 commits 8 branches 109 tags 27 MiB
Commit graph

6447 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
a8af2e1837
Store domains without sorting and unifying them first. This allows us to preserve the relationship of the individual domains to the lists they came from. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-04 23:14:29 +02:00
Mark Drobnak
93ecc046ea
Merge pull request #2912 from pi-hole/tweak/RemoveAdblockSupport 
Remove adblock list style support
 2019-09-03 20:51:09 -04:00
Adam Warner
8bef5dc805
remove n from -ne 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-03 23:56:23 +01:00
Adam Warner
ad41bcca5a
Remove support for adblock style lists to prevent false positives 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-03 23:43:11 +01:00
DL6ER
aed2e35bc0
Print messages only after removing possible matches in comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-02 22:39:28 +02:00
DL6ER
ab90ff565a
Merge pull request #2903 from pi-hole/tweak/store-gravity-timestamp 
Store timestamp when the gravity table was last updated successfully
 2019-09-01 19:05:46 +02:00
DL6ER
ca8982494b
Store timestamp when the gravity table was last updated successfully. This fixes https://github.com/pi-hole/AdminLTE/issues/989 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-01 14:42:07 +02:00
DL6ER
a7b44426cd
Merge pull request #2838 from pi-hole/new/whitelist-regex-support 
Whitelist regex support
 2019-09-01 14:23:37 +02:00
Mark Drobnak
e7af42a9f8
Merge pull request #2897 from pi-hole/fix/readOnlyBin 
Remove readonly attribute of the PI_HOLE_BIN_DIR declaration in pihole
 2019-08-31 14:07:58 -04:00
Dan Schaper
b9fed8fca6
Merge pull request #2891 from niklasea/development 
Restore 'pihole -q' hosts format support and improve matching in edge cases
 2019-08-30 20:56:52 -07:00
Adam Warner
79b8dac0fa
Remove readonly attribute of the PI_HOLE_BIN_DIR declaration in pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-08-30 22:06:14 +01:00
DL6ER
d8eee47ca4
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-28 22:10:26 -07:00
Niklas Elmose Andersen
a3e32d9a15 Properly escape domain regex 
Dots in domain names should not match any character.

Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
 2019-08-27 12:13:28 +02:00
Niklas Elmose Andersen
989d1aff60 Restore and improve 'pihole -q' matching 
Removes regex lookaround which 'grep -E' does not support.
Restores support for blocklists in hosts format.
Simplifies domain match cleanup logic by eliminating an if-condition.
Improves domain matching by eliminating commented domain names,
eliminating false positives in a few edge cases.

Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
 2019-08-26 20:39:56 +02:00
Mark Drobnak
95b2560a08
Merge pull request #2874 from snapsl/tweak/webpage-shellcheck 
tweaked webpage.sh
 2019-08-26 10:56:38 -04:00
Dan Schaper
76133074d1
Merge pull request #2886 from pi-hole/fix/fullpath 
Call 'pihole' with full path in install and cronjobs.
 2019-08-25 15:38:19 -07:00
Dan Schaper
4cfe463dfa
Add back dropped binary call. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-08-24 04:57:23 -07:00
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