moparisthebest/pi-hole
1
0
Fork 0
mirror of https://github.com/moparisthebest/pi-hole synced 2024-11-13 21:05:12 -05:00
Code Issues Releases Wiki Activity

logic to check for yoyo list

Browse Source
This commit is contained in:
jacobsalmela 2014-10-11 15:55:23 -05:00
parent 0011abd74b
commit 691baa1702
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gravity-adv.sh
View File

@ -6,7 +6,11 @@ eventHorizion="/etc/dnsmasq.d/adList.conf"
# Download the original URL to a text file for easier parsing # Download the original URL to a text file for easier parsing
curl -o /tmp/yoyo.txt -s http://pgl.yoyo.org/adservers/serverlist.php?hostformat=unixhosts&mimetype=plaintext curl -o /tmp/yoyo.txt -s http://pgl.yoyo.org/adservers/serverlist.php?hostformat=unixhosts&mimetype=plaintext
if [ -f /tmp/yoyo.txt ];then
cat /tmp/yoyo.txt | grep -v "<" | sed '/^$/d' | sed 's/\ /\\ /g' | sort > /tmp/matter.txt cat /tmp/yoyo.txt | grep -v "<" | sed '/^$/d' | sed 's/\ /\\ /g' | sort > /tmp/matter.txt
else
echo "Unable to get yoyo ad list"
fi
# Download and append other ad URLs from different sources # Download and append other ad URLs from different sources
curl -s http://winhelp2002.mvps.org/hosts.txt | grep -v "#" | grep -v "127.0.0.1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt curl -s http://winhelp2002.mvps.org/hosts.txt | grep -v "#" | grep -v "127.0.0.1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt
@ -18,7 +22,8 @@ curl -s http://adblock.gjtech.net/?format=unix-hosts | grep -v "#" | sed '/^$/d'
# Sort the aggregated results and remove any duplicates # Sort the aggregated results and remove any duplicates
cat /tmp/matter.txt | sort | uniq | sed '/^$/d' > /tmp/andLight.txt cat /tmp/matter.txt | sort | uniq | sed '/^$/d' > /tmp/andLight.txt
# Read the file and prepend "address=/" and append the IP of the Raspberry Pi # Read the file, prepend "address=/", and append the IP of the Raspberry Pi
# This creates a correctly-formatted config file
while read fermion while read fermion
do do
boson=$(echo "$fermion" | tr -d '\r') boson=$(echo "$fermion" | tr -d '\r')