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-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #584 from diginc/development

Browse source 
Only re-block whitelist deletions if in adlists
This commit is contained in:
Mcat12 2016-07-31 14:39:05 -04:00 committed by GitHub
commit c04b3559d0
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
advanced/Scripts/whitelist.sh
View file

@ -175,20 +175,23 @@ function ModifyHostFile(){
echo ":::" echo ":::"
echo "::: Modifying HOSTS file to un-whitelist domains..." echo "::: Modifying HOSTS file to un-whitelist domains..."
for rdom in "${domToRemoveList[@]}" for rdom in "${domToRemoveList[@]}"
do do
if [[ -n $piholeIPv6 ]];then if grep -q "$rdom" /etc/pihole/*.domains; then
echo -n "::: Un-whitelisting $rdom on IPv4 and IPv6..." echo "::: AdLists contain $rdom, re-adding block"
echo "$rdom" | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList if [[ -n $piholeIPv6 ]];then
echo " done!" echo -n "::: Restoring block for $rdom on IPv4 and IPv6..."
else echo "$rdom" | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
echo -n "::: Un-whitelisting $rdom on IPv4" echo " done!"
echo "$rdom" | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList else
echo " done!" echo -n "::: Restoring block for $rdom on IPv4..."
fi echo "$rdom" | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
echo -n "::: Removing $rdom from $whitelist..." echo " done!"
echo "$rdom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $whitelist fi
echo " done!" fi
done echo -n "::: Removing $rdom from $whitelist..."
echo "$rdom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $whitelist
echo " done!"
done
fi fi
} }