e57d0fb93c
Remove the empty templates gravity.list, white.list, black.list. The old source files whitelist.txt, blacklist.txt, and regex.list still exist and need to be removed in a follow-up commit
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-24 19:05:08 +02:00
ee20164207
Remove detect_pihole_blocking_status() as we can modify the database at any time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-24 19:01:31 +02:00
bbc392caeb
More review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-22 22:49:02 +01:00
61840edb30
Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-22 22:46:19 +01:00
f9250d91a5
Explictly escape the escape.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-06 19:17:13 +01:00
491c828661
Improved code, ensure that gravity.sh passes shellcheck as a whole
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-06 19:09:09 +01:00
644ec36e64
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-06 18:57:48 +01:00
ec5b16ef85
Fix incomplete comment
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-05 19:08:08 +01:00
dbbf21071b
Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database()
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-05 19:05:11 +01:00
b2f4385232
Avoid infinity loop if gravity optimization fails
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 17:05:00 +01:00
1f9a7d0b0c
Only run VACUUM on "pihole -g -o"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 17:01:38 +01:00
d5feffa117
Do not backup the database
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 16:45:19 +01:00
fc62cf7e2f
Only run VACUUM on "full" gravity runs
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 16:45:06 +01:00
93f1859bab
Store regex in gravity.db as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 15:13:18 +01:00
dcf0a605cf
Use views for all tables and set disabled column to false for those tables that support it
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 14:14:14 +01:00
8a91fe6992
Store domains in gravit tables: gravity, whitelist, blacklist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 13:21:26 +01:00
09c4c88a6d
Create and fill gravity.db during pihole -g
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 13:04:31 +01:00
05bd88b4d8
Update agent string: the selected string is the most abundant one on 06 Dec 2018 with a percentage of almost 10%
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-12-06 18:04:17 +01:00
83f7bd66e6
Don't `mv` `preEventHorizon`, copy it.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-12-05 22:29:01 +00:00
5c621fa253
Lints
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-12 17:21:34 -08:00
f9e71bee0a
Account for port, or lack of, in PIHOLE_DNS_1
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-12 17:15:24 -08:00
33939a30ea
Merge pull request #2347 from Gusher123/patch-1
...
Don't let one blocklist block an other blocklist
2018-09-30 21:24:45 -04:00
0131055ec9
Submission stale, addressing @mcat12's comments
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-09-30 20:00:06 +01:00
337cc5ca18
BLOCKING -> BLOCKING_ENABLED
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 17:22:10 +02:00
b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 14:19:59 +02:00
6cde066edd
Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 13:43:14 +02:00
2feb5f22cc
Signed-off-by
...
This is my commit message
Signed-off-by: Gusher123 <t.siebeling@gmail.com>
2018-08-12 10:05:58 +02:00
03a9d3bc5b
Not hardcoding dns and covering all blockingmodes
...
Using double brackets
Mode double brackets
2018-08-12 03:05:53 +02:00
e58142b4ac
Added comments
2018-08-11 15:14:45 +02:00
3e5c6afaee
Don't let one blocklist, block an other
...
If a blocklist is blocked by an other and 'pihole -g' is run, update the blocked blocklist by useing an alternate dns server (in this case 1.1.1.1) to acquire the IP adres and download the blocklist using the 'curl --resolve' (https://curl.haxx.se/docs/manpage.html#--resolve )
2018-08-11 14:33:33 +02:00
760dd01b50
Use grep invert-match
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 18:36:06 +02:00
5bf90cb77d
Use alternative logic for counting regex file entries, skipping commented out lines
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 18:02:01 +02:00
1a8d5fb4a9
Allow PHP to edit the regex file if installed
...
Fixes permissions error on the web interface when modifying the regex.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-28 21:57:39 -04:00
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
...
Use regex lists instead of wildcards for blocking
2018-07-14 06:10:44 -07:00
72be7ad5f0
Don't count commented out regex lines
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-12 21:21:06 -04:00
7ddae8f2eb
Treat URLs without a protocol as HTTP
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
2018-07-02 19:59:22 +10:00
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
2018-06-29 23:12:34 -04:00
55175087c4
Set regex file permissions for web access
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-28 22:52:44 -04:00
d5547f5c7c
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
2018-06-24 16:06:55 -07:00
4fc3546887
Merge pull request #2069 from pi-hole/fix/nullbyte
...
Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input
2018-06-20 20:42:24 -04:00
bc705aac03
Add automated wildcard list -> regex filter conversion
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-06-17 14:39:19 +02:00
3149a95d6a
Fix gravity_ParseFileIntoDomains Awk comment
...
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
2018-06-03 13:33:33 -04:00
5f2217a079
Fix for gravity.list not being emptied with an empty/missing adlist file.
...
Variable output depending on content of /existence of adlist
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 21:56:33 +01:00
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists
2018-04-29 13:39:17 +01:00
9c29bd627e
fix user blacklisting
2018-04-21 23:55:33 +01:00
d24b141d8b
Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-21 23:58:42 +02:00
bac9e005ae
Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-21 23:27:36 +02:00
d4d1ec2568
Merge pull request #2124 from pi-hole/development
...
Internal
2018-04-17 11:54:50 -07:00
88d4108f92
- Add new whipstail to choose from example blocklists on new install
...
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 10:33:06 +01:00
187848660c
try another fix for #2028
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-31 16:12:29 -05:00
DL6ER
Adam Warner
Dan Schaper
Mark Drobnak
Gusher123
Mcat12
Dan Schaper
WaLLy3K
Jacob Salmela