Dan Schaper
|
dbc82cfb6a
|
Merge pull request #2236 from pi-hole/new/regex-lists
Use regex lists instead of wildcards for blocking
|
6 years ago |
Mcat12
|
72be7ad5f0
|
Don't count commented out regex lines
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
6 years ago |
WaLLy3K
|
7ddae8f2eb
|
Treat URLs without a protocol as HTTP
Signed off by WaLLy3K <wally3k@pi-hole.net>
|
6 years ago |
Mcat12
|
0f4968d75c
|
Merge remote-tracking branch 'origin/development' into new/regex-lists
|
6 years ago |
Mcat12
|
55175087c4
|
Set regex file permissions for web access
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
6 years ago |
Dan Schaper
|
d5547f5c7c
|
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
|
6 years ago |
Mark Drobnak
|
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
|
6 years ago |
DL6ER
|
bc705aac03
|
Add automated wildcard list -> regex filter conversion
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Mark Drobnak
|
3149a95d6a
|
Fix gravity_ParseFileIntoDomains Awk comment
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
|
6 years ago |
Adam Warner
|
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>
|
6 years ago |
Adam Warner
|
3216d65353
|
Merge branch 'development' into new/RemoveDefaultBlocklists
|
6 years ago |
Adam Warner
|
9c29bd627e
|
fix user blacklisting
|
6 years ago |
DL6ER
|
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>
|
6 years ago |
DL6ER
|
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>
|
6 years ago |
Dan Schaper
|
d4d1ec2568
|
Merge pull request #2124 from pi-hole/development
Internal
|
6 years ago |
Adam Warner
|
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>
|
6 years ago |
Jacob Salmela
|
187848660c
|
try another fix for #2028
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
|
6 years ago |
Jacob Salmela
|
c3f391dc5a
|
maybe fixes #2028 by deleting null bytes
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
|
6 years ago |
DL6ER
|
ff47ab12fb
|
Save number of effectively blocked domains in /etc/pihole/numBlocked
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Riley Avron
|
f390671018
|
Improve scheme matching to avoid inadvertent blocking
Signed-off-by: Riley Avron <riley.avron@gmail.com>
|
6 years ago |
Riley Avron
|
512ec7fb87
|
Remove unneeded ifs in awk
Signed-off-by: Riley Avron <riley.avron@gmail.com>
|
6 years ago |
Adam Warner
|
24219422df
|
Merge branch 'development' into FTLDNSremoveDnsmasq
|
6 years ago |
Adam Warner
|
ad1f210528
|
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
Signed-off-by: Adam Warner <adamw@rner.email>
|
6 years ago |
Adam Warner
|
cadab61a21
|
Merge branch 'development' into FTLDNS
|
6 years ago |
DL6ER
|
7ed45d26c2
|
Remove " " at some places where they shouldn't be
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
e8ec0dc701
|
Use pihole-FTL resolver in pihole and gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Adam Warner
|
6b4685b333
|
much more elegant to export LC_ALL at the beginning of the script!
Signed-off-by: Adam Warner <adamw@rner.email>
|
6 years ago |
Adam Warner
|
d4ac818a0b
|
Specifty `LC_ALL=C` when dealing with sorted lists.
Signed-off-by: Adam Warner <adamw@rner.email>
|
6 years ago |
DL6ER
|
fc5034696d
|
Don't auto-whitelist blocking list domains
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Dan Schaper
|
9f2ce0e296
|
Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity
Potential fix for #1909
|
6 years ago |
Adam Warner
|
55e10d8287
|
replace another grep -F as pointed out by @StarPicard
Signed-off-by: Adam Warner <adamw@rner.email>
|
6 years ago |
Adam Warner
|
f1956119fb
|
proposed gravity function renames
Signed-off-by: Adam Warner <adamw@rner.email>
|
6 years ago |
Adam Warner
|
876170767c
|
Print actual domain instead of grep output of "Binary file /etc/pihole/list.preEventHorizon matches" when a domain with a unicode char is in a source list.
Signed-off-by: Adam Warner <adamw@rner.email>
|
6 years ago |
Adam Warner
|
2d3906450a
|
add back in str local var, and change ticks to info on whitelist lines
Signed-off-by: Adam Warner <adamw@rner.email>
|
7 years ago |
Adam Warner
|
5ecc46d85b
|
Accidentally too many spaces
Signed-off-by: Adam Warner <adamw@rner.email>
|
7 years ago |
Adam Warner
|
ddd6f3dbe5
|
Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed.
Signed-off-by: Adam Warner <adamw@rner.email>
|
7 years ago |
Adam Warner
|
761fd13a70
|
Remove quotes from the uniqDomains array to actually whitelist the sources
Signed-off-by: Adam Warner <adamw@rner.email>
|
7 years ago |
Adam Warner
|
c24e5cd3f6
|
:codacy: :codacy2: :codacy3:
Signed-off-by: Adam Warner <adamw@rner.email>
|
7 years ago |
Adam Warner
|
cc3035267f
|
Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries.
Signed-off-by: Adam Warner <adamw@rner.email>
|
7 years ago |
Jacob Salmela
|
80e17ab721
|
potentially fixes #1806 by falling back to dig if getent fails
Signed-off-by: Jacob Salmela <github@decoy.email>
|
7 years ago |
Mcat12
|
8d721d086c
|
Modify indentation
|
7 years ago |
DL6ER
|
6f0bb30def
|
Improve indentation
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
7 years ago |
DL6ER
|
c54f04ef4c
|
Repair username:password filtering
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
7 years ago |
DL6ER
|
eb83081a5c
|
Clarify error message: File could also have been of zero size
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
7 years ago |
DL6ER
|
8976930e20
|
Properly detect if local file was successfully downloaded
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
7 years ago |
DL6ER
|
164a81776e
|
Allow to add local lists to gravity using e.g. file:///path/to/my.list in adlists.list
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
7 years ago |
DL6ER
|
39ab1e1ea7
|
When using the Pi-hole DHCP server, local host names are called "something.local". Thir PR ensures that clients that are connected via VPN are augmented by a similar suffix like "someother.vpn".
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
7 years ago |
spacedingo
|
60365ad36a
|
Update gravity.sh
|
7 years ago |
spacedingo
|
466e6d9b30
|
Redo pull #1687
Fix for case sensitive duplicate domains
The change (https://github.com/pi-hole/pi-hole/pull/1687) was recently undone.
|
7 years ago |
WaLLy3K
|
b9bcfe36ff
|
Place errors on newline
|
7 years ago |