From 4e19a2c5f3f801d287cf7c64592aaf7032db1bbc Mon Sep 17 00:00:00 2001 From: Clayton Auld Date: Fri, 2 Apr 2021 22:11:27 -0800 Subject: [PATCH 1/5] Added quick whitelist install script. --- install_whitelist.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 install_whitelist.sh diff --git a/install_whitelist.sh b/install_whitelist.sh new file mode 100755 index 0000000..40573a0 --- /dev/null +++ b/install_whitelist.sh @@ -0,0 +1,13 @@ +# User reported false positives for MMotti's regex filters +# https://github.com/mmotti + +# This file is not currently referenced during install. +# If you experience issues with any of the following domains, +# you will need the add them manually to your Pi-hole installation. +pihole -w \ +anti-ad.net \ +iij.ad.jp \ +stats.foldingathome.org \ +stats.stackexchange.com \ +www.ad.nl \ +www.iij.ad.jp From 1582ff112563af2c2f50757e1ba6b1a5b217ce79 Mon Sep 17 00:00:00 2001 From: Clayton Auld Date: Fri, 2 Apr 2021 22:17:16 -0800 Subject: [PATCH 2/5] Update install_whitelist.sh --- install_whitelist.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install_whitelist.sh b/install_whitelist.sh index 40573a0..1f1a13d 100755 --- a/install_whitelist.sh +++ b/install_whitelist.sh @@ -1,3 +1,5 @@ +#! /bin/bash + # User reported false positives for MMotti's regex filters # https://github.com/mmotti From fcd4dbcf542156b176c815d42a66c0afbd067ad4 Mon Sep 17 00:00:00 2001 From: Clayton Auld Date: Fri, 2 Apr 2021 22:23:52 -0800 Subject: [PATCH 3/5] Updated README. --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index aa71892..6e0336f 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,24 @@ This is a custom regex filter file for use with Pi-hole v4+ (FTLDNS). The purpose of this list is to compliment your existing blocklists using powerful regular expressions that can cover a very broad range of domains. A single regular expression can block thousands of 'bad' domains, and can even accommodate for domains following specific patterns that may not even (yet) exist on standard blocklists. There are also some optional regex filters separate to the main installer that can be added manually (if desired): -* [Facebook](https://github.com/mmotti/pihole-regex/tree/master/social) -* [Miscellaneous Items](https://github.com/mmotti/pihole-regex/tree/master/miscellaneous) -* [User Suggested](https://github.com/mmotti/pihole-regex/tree/master/user%20suggested) +* [Facebook](https://github.com/clayauld/pihole-regex/tree/master/social) +* [Miscellaneous Items](https://github.com/clayauld/pihole-regex/tree/master/miscellaneous) +* [User Suggested](https://github.com/clayauld/pihole-regex/tree/master/user%20suggested) -All commands will need to be entered via Terminal (PuTTY or your SSH client of choice) after logging in and [**Python 3.6+**](https://github.com/mmotti/pihole-regex/issues/16) is required. +All commands will need to be entered via Terminal (PuTTY or your SSH client of choice) after logging in and [**Python 3.6+**](https://github.com/clayauld/pihole-regex/issues/16) is required. ### Add to Pi-Hole ``` -curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/install.py | sudo python3 +curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/install.py | sudo python3 ``` ### Remove from Pi-Hole ``` -curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/uninstall.py | sudo python3 +curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/uninstall.py | sudo python3 ``` ### False Positives ### -Due to the restrictive nature of these regexps, you may encounter a small number of false positives for domain names that are similar to ad-serving / tracking domains. I have created a [whitelist file](https://raw.githubusercontent.com/mmotti/pihole-regex/master/whitelist.list) to populate with user reported false positives. Please note that this file is not currently referenced during installation and is intended to be used only if you experience issues or for reference purposes. +Due to the restrictive nature of these regexps, you may encounter a small number of false positives for domain names that are similar to ad-serving / tracking domains. I have created a [whitelist file](https://raw.githubusercontent.com/clayauld/pihole-regex/master/whitelist.list) to populate with user reported false positives. Please note that this file is not currently referenced during installation and is intended to be used only if you experience issues or for reference purposes. ### Keep regexps up-to-date with cron (optional) The following instructions will create a cron job to run every monday at 02:30 (adjust the time to suit your needs): @@ -32,7 +32,8 @@ The following instructions will create a cron job to run every monday at 02:30 ( ``` SHELL=/bin/bash PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -30 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/install.py | /usr/bin/python3 +30 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/install.py | /usr/bin/python3 +35 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/install_whitelist.sh | /bin/bash ``` 3. Save changes From a7765c273a8641d77320e616dd7d1c1ef9da780b Mon Sep 17 00:00:00 2001 From: Clayton Auld Date: Fri, 2 Apr 2021 22:31:35 -0800 Subject: [PATCH 4/5] New branch for creating PRs. --- install_whitelist.sh | 3 ++- whitelist.list | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install_whitelist.sh b/install_whitelist.sh index 1f1a13d..e19fdd8 100755 --- a/install_whitelist.sh +++ b/install_whitelist.sh @@ -12,4 +12,5 @@ iij.ad.jp \ stats.foldingathome.org \ stats.stackexchange.com \ www.ad.nl \ -www.iij.ad.jp +www.iij.ad.jp \ +support.iam.ad.azure.com diff --git a/whitelist.list b/whitelist.list index 07c914b..f4a6e8b 100644 --- a/whitelist.list +++ b/whitelist.list @@ -11,3 +11,4 @@ stats.foldingathome.org stats.stackexchange.com www.ad.nl www.iij.ad.jp +support.iam.ad.azure.com From 3e44371d8ad9ac935ed8bfb15eaad74f9cacb0b6 Mon Sep 17 00:00:00 2001 From: Clayton Auld Date: Fri, 2 Apr 2021 22:35:13 -0800 Subject: [PATCH 5/5] Update README with new info for PR. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6e0336f..1abf7d8 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,24 @@ This is a custom regex filter file for use with Pi-hole v4+ (FTLDNS). The purpose of this list is to compliment your existing blocklists using powerful regular expressions that can cover a very broad range of domains. A single regular expression can block thousands of 'bad' domains, and can even accommodate for domains following specific patterns that may not even (yet) exist on standard blocklists. There are also some optional regex filters separate to the main installer that can be added manually (if desired): -* [Facebook](https://github.com/clayauld/pihole-regex/tree/master/social) -* [Miscellaneous Items](https://github.com/clayauld/pihole-regex/tree/master/miscellaneous) -* [User Suggested](https://github.com/clayauld/pihole-regex/tree/master/user%20suggested) +* [Facebook](https://github.com/mmotti/pihole-regex/tree/master/social) +* [Miscellaneous Items](https://github.com/mmotti/pihole-regex/tree/master/miscellaneous) +* [User Suggested](https://github.com/mmotti/pihole-regex/tree/master/user%20suggested) -All commands will need to be entered via Terminal (PuTTY or your SSH client of choice) after logging in and [**Python 3.6+**](https://github.com/clayauld/pihole-regex/issues/16) is required. +All commands will need to be entered via Terminal (PuTTY or your SSH client of choice) after logging in and [**Python 3.6+**](https://github.com/mmotti/pihole-regex/issues/16) is required. ### Add to Pi-Hole ``` -curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/install.py | sudo python3 +curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/install.py | sudo python3 ``` ### Remove from Pi-Hole ``` -curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/uninstall.py | sudo python3 +curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/uninstall.py | sudo python3 ``` ### False Positives ### -Due to the restrictive nature of these regexps, you may encounter a small number of false positives for domain names that are similar to ad-serving / tracking domains. I have created a [whitelist file](https://raw.githubusercontent.com/clayauld/pihole-regex/master/whitelist.list) to populate with user reported false positives. Please note that this file is not currently referenced during installation and is intended to be used only if you experience issues or for reference purposes. +Due to the restrictive nature of these regexps, you may encounter a small number of false positives for domain names that are similar to ad-serving / tracking domains. I have created a [whitelist file](https://raw.githubusercontent.com/mmotti/pihole-regex/master/whitelist.list) to populate with user reported false positives. Please note that this file is not currently referenced during installation and is intended to be used only if you experience issues or for reference purposes. ### Keep regexps up-to-date with cron (optional) The following instructions will create a cron job to run every monday at 02:30 (adjust the time to suit your needs): @@ -32,8 +32,8 @@ The following instructions will create a cron job to run every monday at 02:30 ( ``` SHELL=/bin/bash PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -30 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/install.py | /usr/bin/python3 -35 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/clayauld/pihole-regex/master/install_whitelist.sh | /bin/bash +30 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/install.py | /usr/bin/python3 +35 2 * * 1 /usr/bin/curl -sSl https://raw.githubusercontent.com/mmotti/pihole-regex/master/install_whitelist.sh | /bin/bash ``` 3. Save changes