arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-10-19 14:29:36 +00:00
Code Issues Releases Wiki Activity
4,069 Commits 7 Branches 109 Tags 18 MiB
037d52104a
Commit Graph

4069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER
037d52104a
New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-26 10:58:39 +01:00
DL6ER
d883854aad
Use constant for long path. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-10-03 12:12:32 +02:00
DL6ER
756c99653e
Merge branch 'development' into new/internal-blocking 2019-10-03 12:01:27 +02:00
Mark Drobnak
3269c63f89
Merge pull request #2948 from pi-hole/fix/restart_lighttpd 
Do not create empty regex.list file
 2019-09-29 12:27:25 -04:00
DL6ER
149fb0c216
Do not install a blank regex file. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-29 18:03:37 +02:00
DL6ER
d244a018d0
Merge pull request #2944 from pi-hole/fix/vw_gravity_creation_v1 
Fix gravity database table creation order
 2019-09-26 14:27:05 +02:00
DL6ER
2e0370367c
Print when we upgrade gravity database version. This will make possibly failed upgrades easier to debug. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-26 14:02:20 +02:00
DL6ER
3cb4f6d9d4
We cannot create vw_gravity before having created vw_whitelist as the former depends onthe later. This commit changes the order in which the tables are created. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-26 13:50:54 +02:00
Mark Drobnak
ae3b8be4d4
Merge pull request #2938 from pi-hole/release/v4.3.2 
Release v4.3.2 merge to development for update.
 2019-09-21 20:40:38 -04:00
Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-22 01:16:44 +01:00
DL6ER
a27c7b1398
regex white- and blacklist views need to be re-created as well as we need the ID for storing internally whether or not we try to match a given regex for a specific client. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-18 20:58:44 +02:00
DL6ER
a71f35d263
Merge pull request #2932 from pi-hole/fix/no-backup-no-error 
Fix cross where there is no error
 2019-09-17 23:51:46 +02:00
Adam Warner
9a6deb5a1a
Fix tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-17 21:16:49 +01:00
DL6ER
f582344b9a
"No default index.lighttpd.html file found... not backing up" is not an error. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-17 21:59:48 +02:00
DL6ER
7b48431917
Add client_by_group table like we have for the other lists. It stores associations between individual clients and list groups. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-09 00:03:57 +02:00
Mark Drobnak
847c4f26aa
Merge pull request #2916 from pi-hole/fix/disable-firefox-doh 
Improve #2915
 2019-09-07 17:58:02 -04:00
DL6ER
1f36ec48e3
Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 23:11:20 +02:00
DL6ER
ff08add7c0
Update vw_whitelist and vw_blacklist to return group_id alongside domain so we can filter if the current client wants to get this domain blocked or not. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 13:01:36 +02:00
DL6ER
b4131ae817
Merge pull request #2915 from pi-hole/new/disable-firefox-doh 
Prevent Firefox from automatically switching over to DNS-over-HTTPS
 2019-09-07 12:24:01 +02:00
DL6ER
ffc91a6c81
Update view vw_gravity to only return domains from enabled adlists. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 11:17:53 +02:00
DL6ER
525ec8cd01
Signal to Firefox that the local network is unsuitable for DNS-over-HTTPS 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 08:44:03 +02:00
Dan Schaper
b209629579
Merge pull request #2909 from pi-hole/fix/domains_in_comment 
Print messages only after removing possible matches in comments
 2019-09-05 21:30:34 -07:00
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