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

oops im a n00b

Browse Source
This commit is contained in:
jacobsalmela 2015-02-08 17:06:43 -06:00
parent b7e6c4ec28
commit eb4d2382cd
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gravity-adv.sh
View File

@ -29,29 +29,9 @@ echo "Getting someone who cares ad list..."
curl -s http://someonewhocares.org/hosts/hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' >> /tmp/matter.txt curl -s http://someonewhocares.org/hosts/hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' >> /tmp/matter.txt
# Sort the aggregated results and remove any duplicates # Sort the aggregated results and remove any duplicates
#<<<<<<< Updated upstream
echo "removing duplicates and formatting to address=/<ad domain>/"$piholeIP echo "removing duplicates and formatting to address=/<ad domain>/"$piholeIP
cat /tmp/matter.txt | sort | uniq | sed '/^$/d' | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt cat /tmp/matter.txt | sort | uniq | sed '/^$/d' | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt
mv /tmp/andLight.txt $eventHorizion mv /tmp/andLight.txt $eventHorizion
=======
echo "Sorting and removing duplicates..."
cat /tmp/matter.txt | sort | uniq | sed '/^$/d' > /tmp/andLight.txt
# Read the file, prepend "address=/", and append the IP of the Raspberry Pi
# This creates a correctly-formatted config file
while read fermion
do
boson=$(echo "$fermion" | tr -d '\r')
# WHITELSISTING
case $boson in
# Change these domains below to whitelist a site (will show ads)
jacobsalmela.com) echo "--------WHITELISTED $boson";;
lifehacker.com) echo "--------WHITELISTED $boson";;
*) echo "address=/$boson/$piholeIP" >> $eventHorizion;
echo "Added $boson...";;
esac
done </tmp/andLight.txt
>>>>>>> Stashed changes
# Restart DNS # Restart DNS
service dnsmasq restart service dnsmasq restart