diff --git a/gravity-adv.sh b/gravity-adv.sh index 5de6c4d1..4b62817e 100755 --- a/gravity-adv.sh +++ b/gravity-adv.sh @@ -2,11 +2,12 @@ # The Pi-hole now blocks over 120,000 ad domains # Address to send ads to (the RPi) piholeIP="127.0.0.1" -# Optionally, uncomment to automatically detect the address. Thanks Gregg -#piholeIP=$(ifconfig eth0 | awk '/inet addr/{print substr($2,6)}') +# Optionally, uncomment to automatically detect the local IP address. +#piholeIP=$(hostname -I) # Config file to hold URL rules eventHorizion="/etc/dnsmasq.d/adList.conf" +blacklist=/etc/pihole/blacklist.txt whitelist=/etc/pihole/whitelist.txt # Create the pihole resource directory if it doesn't exist. Future files will be stored here @@ -34,6 +35,14 @@ curl -s http://someonewhocares.org/hosts/hosts | grep -v "#" | sed '/^$/d' | sed echo "Getting Mother of All Ad Blocks list..." # 102168 domains!! Thanks Kacy curl -A 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' -e http://forum.xda-developers.com/ http://adblock.mahakala.is/ | grep -v "#" | awk '{print $2}' | sort >> /tmp/matter.txt +# Add entries from the local blacklist file if it exists in /etc/pihole directory +if [[ -f $blacklist ]];then + echo "Getting the local blacklist from /etc/pihole directory" + cat $blacklist >> /tmp/matter.txt +else + : +fi + # Sort the aggregated results and remove any duplicates # Remove entries from the whitelist file if it exists at the root of the current user's home folder if [[ -f $whitelist ]];then @@ -54,4 +63,4 @@ echo "$numberOfAdsBlocked ad domains blocked." sudo mv /tmp/andLight.txt $eventHorizion # Restart DNS -sudo service dnsmasq restart \ No newline at end of file +sudo service dnsmasq restart