Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 15:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update gravity-adv.sh

Browse source 
Whitelist fix, added blacklist  and reverse sort
This commit is contained in:
pizzafritta 2015-03-12 12:37:41 +01:00
parent a8874fb606
commit 594036d808
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gravity-adv.sh
View file

@ -8,6 +8,7 @@ piholeIP="127.0.0.1"
# Config file to hold URL rules # Config file to hold URL rules
eventHorizion="/etc/dnsmasq.d/adList.conf" eventHorizion="/etc/dnsmasq.d/adList.conf"
whitelist=/etc/pihole/whitelist.txt whitelist=/etc/pihole/whitelist.txt
blacklist=/etc/pihole/blacklist.txt
# Create the pihole resource directory if it doesn't exist. Future files will be stored here # Create the pihole resource directory if it doesn't exist. Future files will be stored here
if [[ -d /etc/pihole/ ]];then if [[ -d /etc/pihole/ ]];then
@ -38,7 +39,7 @@ curl -A 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' -
# Remove entries from the whitelist file if it exists at the root of the current user's home folder # Remove entries from the whitelist file if it exists at the root of the current user's home folder
if [[ -f $whitelist ]];then if [[ -f $whitelist ]];then
echo "Removing duplicates, whitelisting, and formatting the list of domains..." echo "Removing duplicates, whitelisting, and formatting the list of domains..."
cat /tmp/matter.txt | sed $'s/\r$//' | sort | uniq | sed '/^$/d' | grep -v -x -f $whitelist | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt cat /tmp/matter.txt $blacklist| sed $'s/\r$//' | awk -F "." '{for(i=NF; i > 1; i--) printf "%s.", $i; print $1}' | sort | awk -F "." '{for(i=NF; i > 1; i--) printf "%s.", $i; print $1}' | uniq | sed '/^$/d' | grep -vwf $whitelist | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt
numberOfSitesWhitelisted=$(cat $whitelist | wc -l | sed 's/^[ \t]*//') numberOfSitesWhitelisted=$(cat $whitelist | wc -l | sed 's/^[ \t]*//')
echo "$numberOfSitesWhitelisted domains whitelisted." echo "$numberOfSitesWhitelisted domains whitelisted."
else else