fixes #145

A much more elegant way to get the screen size.

README.md

@@ -1,4 +1,6 @@
-# Automated Install
+# Automated Install 
+#### Designed For Raspberry Pi B, B+, 2,
+##### and Zero (with an Ethernet adapter)
 
 1. Install Raspbian 
 2. Run the command below
@@ -11,14 +13,18 @@ Once installed, **configure any device to use the Raspberry Pi as its DNS server
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")
 
-# Raspberry Pi Ad Blocker 
-**A black hole for ads, hence Pi-hole**
+# How Does It Work?
+**Watch the 60-second video below to get a quick overview**
 
-![Pi-hole](http://i.imgur.com/wd5ltCU.png)
+[![Pi-hole exlplained](http://i.imgur.com/wd5ltCU.png)](https://vimeo.com/135965232)
 
-The Pi-hole is a DNS/Web server that will **block ads for any device on your network**.
+## Video Coverage
 
-## Coverage
+### TekThing
+
+Pi-hole is mentioned at the two minute mark
+
+[![Pi-hole on TekThing](http://img.youtube.com/vi/8Co59HU2gY0/0.jpg)](https://youtu.be/8Co59HU2gY0?t=2m)
 
 ### Security Now! Podcast
 Pi-hole is mentioned at 100 minutes and 26 seconds (the link brings you right there)
@@ -26,7 +32,16 @@ Pi-hole is mentioned at 100 minutes and 26 seconds (the link brings you right th
 
 ### Tech Blogs
 
-Featured on [MakeUseOf](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/) and [Lifehacker](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
+Pi-hole has been written about on:
+
+- [Medium](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)
+- [MakeUseOf](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
+- [Lifehacker](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
+
+## Partnering With Optimal.com
+
+Pi-hole will be teaming up with [Rob Leathern's subscription service to avoid ads](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d).  This service is unique and will help content-creators and publishers [still make money from visitors who are using an ad ablocker](http://techcrunch.com/2015/12/17/the-new-optimal/).
+
 
 ## Technical Details
 
@@ -49,11 +64,11 @@ The [Web interface](https://github.com/jacobsalmela/AdminLTE#pi-hole-admin-dashb
 If you want to use your own variables for the gravity script (i.e. storing the files in a different location) and don't want to have to change them every time there is an update to the script, create a file called `/etc/pihole/pihole.conf`. In it, you should add your own variables in a similar fashion as shown below:
 
 ```
-origin=/var/run/pihole
+piholeDir=/var/run/pihole
 adList=/etc/dnsmasq.d/adList
 ```
 
-See [this PR](https://github.com/jacobsalmela/pi-hole/pull/20) for more details.
+See the [Wiki](https://github.com/jacobsalmela/pi-hole/wiki/Customization) entry for more details.
 
 ### How It Works
 A technical and detailed description can be found [here](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0)!
@@ -64,5 +79,6 @@ This script will work for other UNIX-like systems with some slight **modificatio
 ### Examples Of The Pi-hole On Other Operating Systems
 - [Sky-Hole](http://dlaa.me/blog/post/skyhole)
 - [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
+- [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")

advanced/Scripts/chronometer.sh

@@ -1,6 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Displays Pi-hole stats on the Adafruit PiTFT 2.8" touch screen
 # Set the pi user to log in automatically and run this script from /etc/profile
+# (c) 2015 by Jacob Salmela
+# This file is part of Pi-hole.
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
 for (( ; ; ))
 do
 	clear

advanced/Scripts/piholeLogFlush.sh

@@ -1,3 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Flushes /var/log/pihole.log
+# (c) 2015 by Jacob Salmela
+# This file is part of Pi-hole.
+#
+#Pi-hole is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 2 of the License, or
+#(at your option) any later version.
+
 truncate -s 0 /var/log/pihole.log

advanced/Scripts/whitelist.sh

@@ -1,6 +1,19 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# (c) 2015 by Jacob Salmela
+# This file is part of Pi-hole.
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
 
-if [ $# = 0 ]; then
+whitelist=/etc/pihole/whitelist.txt
+adList=/etc/pihole/gravity.list
+if [[ ! -f $whitelist ]];then
+    touch $whitelist
+fi
+
+if [[ $# = 0 ]]; then
     echo "Immediately whitelists one or more domains."
     echo "Usage: whitelist.sh domain1 [domain2 ...]"
 fi
@@ -15,28 +28,28 @@ do
   # Construct basic pattern to match domain name.
   basicpattern=$(echo $var | awk -F '[# \t]' 'NF>0&&$1!="" {print ""$1""}' | sed 's/\./\\./g')
 
-  if [ "$basicpattern" != "" ]; then
+  if [[ "$basicpattern" != "" ]]; then
     # Add to the combination pattern that will be used below
-    if [ "$combopattern" != "" ]; then combopattern="$combopattern|"; fi
+    if [[ "$combopattern" != "" ]]; then combopattern="$combopattern|"; fi
     combopattern="$combopattern$basicpattern"
 
     # Also add the domain to the whitelist but only if it's not already present
-    grep -E -q "^$basicpattern$" /etc/pihole/whitelist.txt \
-    || echo "$var" >> /etc/pihole/whitelist.txt
+    grep -E -q "^$basicpattern$" $whitelist \
+    || echo "$var" >> $whitelist
   fi
 done
 
 # Now report on and remove matched domains
-if [ "$combopattern" != "" ]; then
+if [[ "$combopattern" != "" ]]; then
   echo "Modifying hosts file..."
-  
+
   # Construct pattern to match entry in hosts file.
   # This consists of one or more IP addresses followed by the domain name.
   pattern=$(echo $combopattern | awk -F '[# \t]' '{printf "%s", "^(([0-9]+\.){3}[0-9]+ +)+("$1")$"}')
 
   # Output what will be removed and then actually remove
-  sed -r -n 's/'"$pattern"'/  Removed: \3/p' /etc/pihole/gravity.list
-  sed -r -i '/'"$pattern"'/d' /etc/pihole/gravity.list
+  sed -r -n 's/'"$pattern"'/  Removed: \3/p' $adList
+  sed -r -i '/'"$pattern"'/d' $adList
 
   echo "** $# domain(s) whitelisted."
   # Force dnsmasq to reload /etc/pihole/gravity.list

advanced/dnsmasq.conf

@@ -1,12 +1,50 @@
+# If you want dnsmasq to read another file, as well as /etc/hosts, use
+# this.
 addn-hosts=/etc/pihole/gravity.list
+
+# The following two options make you a better netizen, since they
+# tell dnsmasq to filter out queries which the public DNS cannot
+# answer, and which load the servers (especially the root servers)
+# unnecessarily. If you have a dial-on-demand link they also stop
+# these requests from bringing up the link unnecessarily.
+
+# Never forward plain names (without a dot or domain part)
 domain-needed
+# Never forward addresses in the non-routed address spaces.
 bogus-priv
+
+# If you don't want dnsmasq to read /etc/resolv.conf or any other
+# file, getting its servers from this file instead (see below), then
+# uncomment this.
 no-resolv
+
+# Add other name servers here, with domain specs if they are for
+# non-public domains.
 server=8.8.8.8
 server=8.8.4.4
-interface=eth0
+
+# If you want dnsmasq to listen for DHCP and DNS requests only on
+# specified interfaces (and the loopback) give the name of the
+# interface (eg eth0) here.
+interface=@INT@
+# Or which to listen on by address (remember to include 127.0.0.1 if
+# you use this.)
 listen-address=127.0.0.1
+
+# Set the cachesize here.
 cache-size=10000
+
+# For debugging purposes, log each DNS query as it passes through
+# dnsmasq.
 log-queries
 log-facility=/var/log/pihole.log
+
+# Normally responses which come from /etc/hosts and the DHCP lease
+# file have Time-To-Live set as zero, which conventionally means
+# do not cache further. If you are happy to trade lower load on the
+# server for potentially stale date, you can set a time-to-live (in
+# seconds) here.
 local-ttl=300
+
+# This allows it to continue functioning without being blocked by syslog, and allows syslog to use dnsmasq for DNS queries without risking deadlock
+log-async

advanced/lighttpd.conf

@@ -1,4 +1,6 @@
 server.modules = (
+	"mod_access",
+	"mod_accesslog",
 	"mod_expire",
 	"mod_compress",
  	"mod_redirect",
@@ -14,6 +16,8 @@ server.pid-file             = "/var/run/lighttpd.pid"
 server.username             = "www-data"
 server.groupname            = "www-data"
 server.port                 = 80
+accesslog.filename			= "/var/log/lighttpd/access.log"
+accesslog.format			= "%{%s}t|%V|%r|%s|%b"
 
 
 index-file.names            = ( "index.php", "index.html", "index.lighttpd.html" )

automated install/basic-install.sh

@@ -3,6 +3,13 @@
 # by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 #
+# (c) 2015 by Jacob Salmela
+# This file is part of Pi-hole.
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
 # pi-hole.net/donate
 #
 # Install with this command (from your Pi):
@@ -13,28 +20,20 @@
 tmpLog=/tmp/pihole-install.log
 instalLogLoc=/etc/pihole/install.log
 
-# Get the screen size in case we need a full-screen message and so we can display a dialog that is sized nicely
-screenSize=$(stty -a | tr \; \\012 | egrep 'rows|columns' | cut '-d ' -f3)
-
 # Find the rows and columns
-rows=$(stty -a | tr \; \\012 | egrep 'rows' | cut -d' ' -f3)
-columns=$(stty -a | tr \; \\012 | egrep 'columns' | cut -d' ' -f3)
+rows=$(tput lines)
+columns=$(tput cols)
 
 # Divide by two so the dialogs take up half of the screen, which looks nice.
 r=$(( rows / 2 ))
 c=$(( columns / 2 ))
 
 # Find IP used to route to outside world
-IPv4info=$(ip route get 8.8.8.8)
-IPv4dev=$(echo $IPv4info| awk '{print $5}')
-IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
-IPv4gw=$(echo $IPv4info | awk '{print $3}')
+IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
+IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
 
-# IPv6 support to be added later
-#IPv6eui64=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
-#IPv6linkLocal=$(ip addr show | awk '/inet/ && /scope\ link/ && /fe80/ {print $2}' | cut -d'/' -f1)
-
-availableInterfaces=$(ip link show | awk -F' ' '/[0-9]: [a-z]/ {print $2}' | grep -v "lo" | cut -d':' -f1)
+availableInterfaces=$(ip -o link | awk '{print $2}' | grep -v "lo" | cut -d':' -f1)
 dhcpcdFile=/etc/dhcpcd.conf
 
 ####### FUCNTIONS ##########
@@ -59,6 +58,9 @@ welcomeDialogs()
 # Display the welcome dialog
 whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "This installer will transform your Raspberry Pi into a network-wide ad blocker!" $r $c
 
+# Support for a part-time dev
+whiptail --msgbox --backtitle "Plea" --title "Free and open source" "The Pi-hole is free, but powered by your donations:  http://pi-hole.net/donate" $r $c
+
 # Explain the need for a static address
 whiptail --msgbox --backtitle "Initating network interface" --title "Static IP Needed" "The Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.
 
@@ -69,9 +71,16 @@ chooseInterface()
 {
 # Turn the available interfaces into an array so it can be used with a whiptail dialog
 interfacesArray=()
+firstloop=1
+
 while read -r line
 do
-interfacesArray+=("$line" "available" "ON")
+mode="OFF"
+if [[ $firstloop -eq 1 ]]; then
+  firstloop=0
+  mode="ON"
+fi
+interfacesArray+=("$line" "available" "$mode")
 done <<< "$availableInterfaces"
 
 # Find out how many interfaces are available to choose from
@@ -82,6 +91,7 @@ for desiredInterface in $chooseInterfaceOptions
 do
 	piholeInterface=$desiredInterface
 	echo "Using interface: $piholeInterface"
+	echo ${piholeInterface} > /tmp/piholeINT
 done
 }
 
@@ -90,9 +100,8 @@ use4andor6()
 # Let use select IPv4 and/or IPv6
 cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
 options=(IPv4 "Block ads over IPv4" on
-         IPv6 "Block ads over IPv4" off)
+         IPv6 "Block ads over IPv6" off)
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
-clear
 for choice in $choices
 do
     case $choice in
@@ -110,7 +119,10 @@ done
 
 useIPv6dialog()
 {
-whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help for IPv6.  Consider donating at: http://pi-hole.net/donate" $r $c
+piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c
+sudo mkdir -p /etc/pihole/
+sudo touch /etc/pihole/.useIPv6
 }
 
 getStaticIPv4Settings()
@@ -148,6 +160,7 @@ else
 					# If the settings are correct, then we need to set the piholeIP
 					# Saving it to a temporary file us to retrieve it later when we run the gravity.sh script
 					echo ${IPv4addr%/*} > /tmp/piholeIP
+					echo $piholeInterface > /tmp/piholeINT
 					# After that's done, the loop ends and we move on
 					ipSettingsCorrect=True
 				else
@@ -171,59 +184,102 @@ done
 fi
 }
 
-
-setStaticIPv4()
-{
-# Append these lines to /etc/dhcpcd.conf to enable a static IP
+setDHCPCD(){
+# Append these lines to dhcpcd.conf to enable a static IP
 echo "interface $piholeInterface
 static ip_address=$IPv4addr
 static routers=$IPv4gw
 static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
-sudo ip addr replace dev $piholeInterface $IPv4addr
 }
 
-installPihole()
-{
+setStaticIPv4(){
+if grep -q $IPv4addr $dhcpcdFile; then
+	# address already set, noop
+	:
+else
+	setDHCPCD
+	sudo ip addr replace dev $piholeInterface $IPv4addr
+	echo "Setting IP to $IPv4addr.  You may need to restart after the install is complete."
+fi
+}
+
+installScripts(){
+sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh
+sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
+sudo curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh
+sudo curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
+sudo chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,piholeLogFlush}.sh
+}
+
+installConfigs(){
+sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
+sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf
+sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf
+sudo sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
+}
+
+stopServices(){
+sudo service dnsmasq stop || true
+sudo service lighttpd stop || true
+}
+
+installDependencies(){
 sudo apt-get update
 sudo apt-get -y upgrade
 sudo apt-get -y install dnsutils bc toilet
 sudo apt-get -y install dnsmasq
 sudo apt-get -y install lighttpd php5-common php5-cgi php5
-sudo mkdir /var/www/html
-sudo chown www-data:www-data /var/www/html
-sudo chmod 775 /var/www/html
-sudo usermod -a -G www-data pi
-sudo service dnsmasq stop
-sudo service lighttpd stop
-sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
-sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
-sudo mv /etc/crontab /etc/crontab.orig
-sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf
-sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf
-sudo mv /etc/crontab /etc/crontab.orig
-sudo curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
-sudo lighty-enable-mod fastcgi fastcgi-php
-sudo mkdir /var/www/html/pihole
-sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html
+}
+
+installWebAdmin(){
 sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip
-sudo unzip -o /var/www/master.zip -d /var/www/html/
+sudo unzip -oq /var/www/master.zip -d /var/www/html/
 sudo mv /var/www/html/AdminLTE-master /var/www/html/admin
 sudo rm /var/www/master.zip 2>/dev/null
 sudo touch /var/log/pihole.log
 sudo chmod 644 /var/log/pihole.log
 sudo chown dnsmasq:root /var/log/pihole.log
-sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh
-sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
-sudo curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh
-sudo curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
-sudo chmod 755 /usr/local/bin/gravity.sh
-sudo chmod 755 /usr/local/bin/chronometer.sh
-sudo chmod 755 /usr/local/bin/whitelist.sh
-sudo chmod 755 /usr/local/bin/piholeLogFlush.sh
+}
+
+installPiholeWeb(){
+sudo mkdir /var/www/html/pihole
+sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
+sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html
+}
+
+installCron(){
+sudo mv /etc/crontab /etc/crontab.orig
+sudo curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
+}
+
+installPihole()
+{
+installDependencies
+stopServices
+sudo chown www-data:www-data /var/www/html
+sudo chmod 775 /var/www/html
+sudo usermod -a -G www-data pi
+sudo lighty-enable-mod fastcgi fastcgi-php
+installScripts
+installConfigs
+installWebAdmin
+installPiholeWeb
+installCron
 sudo /usr/local/bin/gravity.sh
 }
 
+displayFinalMessage(){
+	whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
+
+						$IPv4addr
+						$piholeIPv6
+
+If you set a new IP address, you should restart the Pi.
+
+The install log is in /etc/pihole." $r $c
+}
+
 ######## SCRIPT ############
 # Start the installer
 welcomeDialogs
@@ -249,16 +305,12 @@ fi
 
 # Decide is IPv6 will be used
 if [[ "$useIPv6" = true ]];then
-	# If only IPv6 is selected, exit because it is not supported yet
-	if [[ "$useIPv6" = true ]] && [[ "$useIPv4" = false ]];then
-		useIPv6dialog
-		exit
-	else
-		useIPv6dialog
-	fi
+	useIPv6dialog
+	echo "Using IPv6."
+	echo "Your IPv6 address is: $piholeIPv6"
 else
 	useIPv6=false
-	echo "IPv6 will NOT be used.  Consider a donation at pi-hole.net/donate"
+	echo "IPv6 will NOT be used."
 fi
 
 # Install and log everything to a file
@@ -267,11 +319,7 @@ installPihole | tee $tmpLog
 # Move the log file into /etc/pihole for storage
 sudo mv $tmpLog $instalLogLoc
 
-whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using this IP: $IPv4addr.
-
-If you set a new IP address, it should work fine, but you may want to reboot the Pi at some point.
-
-The install log is in /etc/pihole." $r $c
+displayFinalMessage
 
 sudo service dnsmasq start
 sudo service lighttpd start

automated install/uninstall.sh

@@ -1,5 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Completely uninstalls the Pi-hole
+# (c) 2015 by Jacob Salmela
+# This file is part of Pi-hole.
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
 
 ######### SCRIPT ###########
 sudo apt-get -y remove --purge dnsutils bc toilet

gravity.sh

@@ -1,23 +1,36 @@
 #!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
-# (c) 2015 by Jacob Salmela GPL 2.0
+# (c) 2015 by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Compiles a list of ad-serving domains by downloading them from multiple sources
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
 piholeIPfile=/tmp/piholeIP
+piholeIPv6file=/etc/pihole/.useIPv6
 if [[ -f $piholeIPfile ]];then
     # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
     piholeIP=$(cat $piholeIPfile)
     rm $piholeIPfile
 else
     # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
-	IPv4dev=$(ip route get 8.8.8.8 | awk '{print $5}')
-	piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
-	piholeIP=${piholeIPCIDR%/*}   
+    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+    piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
+    piholeIP=${piholeIPCIDR%/*}
+fi
+
+if [[ -f $piholeIPv6file ]];then
+    # If the file exists, then the user previously chose to use IPv6 in the automated installer
+    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 fi
 
 # Ad-list sources--one per line in single quotes
-# The mahakala source is commented out due to many users having issues with it blocking legitimate domains.  Uncomment at your own risk
+# The mahakala source is commented out due to many users having issues with it blocking legitimate domains.
+# Uncomment at your own risk
 sources=('https://adaway.org/hosts.txt'
 'http://adblock.gjtech.net/?format=unix-hosts'
 #'http://adblock.mahakala.is/'
@@ -47,68 +60,70 @@ if [[ -r $piholeDir/pihole.conf ]];then
     echo "** Local calibration requested..."
         . $piholeDir/pihole.conf
 fi
+
 ###########################
 # collapse - begin formation of pihole
 function gravity_collapse() {
-echo "** Neutrino emissions detected..."
+	echo "** Neutrino emissions detected..."
 
-# Create the pihole resource directory if it doesn't exist.  Future files will be stored here
-if [[ -d $piholeDir ]];then
+	# Create the pihole resource directory if it doesn't exist.  Future files will be stored here
+	if [[ -d $piholeDir ]];then
         # Temporary hack to allow non-root access to pihole directory
         # Will update later, needed for existing installs, new installs should
         # create this directory as non-root
         sudo chmod 777 $piholeDir
         find "$piholeDir" -type f -exec sudo chmod 666 {} \;
-else
+	else
         echo "** Creating pihole directory..."
         mkdir $piholeDir
-fi
+	fi
 }
 
-# patternCheck - check to see if curl downloaded any new files, and then process those
-# files so they are in host format.
+# patternCheck - check to see if curl downloaded any new files.
 function gravity_patternCheck() {
-        patternBuffer=$1
-        # check if the patternbuffer is a non-zero length file
-        if [[ -s "$patternBuffer" ]];then
-                # Some of the blocklists are copyright, they need to be downloaded
-                # and stored as is. They can be processed for content after they
-                # have been saved.
-                cp $patternBuffer $saveLocation
-                echo "Done."
-        else
-                # curl didn't download any host files, probably because of the date check
-                echo "Transporter logic detected no changes, pattern skipped..."
-        fi
+	patternBuffer=$1
+	# check if the patternbuffer is a non-zero length file
+	if [[ -s "$patternBuffer" ]];then
+		# Some of the blocklists are copyright, they need to be downloaded
+		# and stored as is. They can be processed for content after they
+		# have been saved.
+		cp $patternBuffer $saveLocation
+		echo "List updated, transport successful..."
+	else
+		# curl didn't download any host files, probably because of the date check
+		echo "No changes detected, transport skipped..."
+	fi
 }
 
-# transport - curl the specified url with any needed command extentions, then patternCheck
+# transport - curl the specified url with any needed command extentions
 function gravity_transport() {
-        url=$1
-        cmd_ext=$2
-        agent=$3
-        # tmp file, so we don't have to store the (long!) lists in RAM
-        patternBuffer=$(mktemp)
-        heisenbergCompensator=""
-        if [[ -r $saveLocation ]]; then
-                # if domain has been saved, add file for date check to only download newer
-                heisenbergCompensator="-z $saveLocation"
-        fi
-        # Silently curl url
-        curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
+	url=$1
+	cmd_ext=$2
+	agent=$3
 
-        gravity_patternCheck $patternBuffer
+	# tmp file, so we don't have to store the (long!) lists in RAM
+	patternBuffer=$(mktemp)
+	heisenbergCompensator=""
+	if [[ -r $saveLocation ]]; then
+		# if domain has been saved, add file for date check to only download newer
+		heisenbergCompensator="-z $saveLocation"
+	fi
 
-        # Cleanup
-        rm -f $patternBuffer
+	# Silently curl url
+	curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
+	# Check for list updates
+	gravity_patternCheck $patternBuffer
 
+	# Cleanup
+	rm -f $patternBuffer
 }
+
 # spinup - main gravity function
 function gravity_spinup() {
 
-# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
-for ((i = 0; i < "${#sources[@]}"; i++))
-do
+	# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and	 		# blank lines
+	for ((i = 0; i < "${#sources[@]}"; i++))
+	do
         url=${sources[$i]}
         # Get just the domain from the URL
         domain=$(echo "$url" | cut -d'/' -f3)
@@ -119,7 +134,7 @@ do
 
         agent="Mozilla/10.0"
 
-        echo -n "Getting $domain list... "
+        echo -n "  Getting $domain list: "
 
         # Use a case statement to download lists that need special cURL commands
         # to complete properly and reset the user agent when required
@@ -137,32 +152,33 @@ do
                 *) cmd_ext=""
         esac
         gravity_transport $url $cmd_ext $agent
-done
+	done
 }
 
 # Schwarzchild - aggregate domains to one list and add blacklisted domains
 function gravity_Schwarzchild() {
 
-# Find all active domains and compile them into one file and remove CRs
-echo "** Aggregating list of domains..."
-truncate -s 0 $piholeDir/$matter
-for i in "${activeDomains[@]}"
-do	
-   cat $i |tr -d '\r' >> $piholeDir/$matter
-done
+	# Find all active domains and compile them into one file and remove CRs
+	echo "** Aggregating list of domains..."
+	truncate -s 0 $piholeDir/$matter
+	for i in "${activeDomains[@]}"
+	do
+   		cat $i |tr -d '\r' >> $piholeDir/$matter
+	done
+}
 
-# Append blacklist entries if they exist
-if [[ -r $blacklist ]];then
+# Pulsar - White/blacklist application
+function gravity_pulsar() {
+
+	# Append blacklist entries if they exist
+	if [[ -r $blacklist ]];then
         numberOf=$(cat $blacklist | sed '/^\s*$/d' | wc -l)
         echo "** Blacklisting $numberOf domain(s)..."
         cat $blacklist >> $piholeDir/$matter
-fi
-}
+	fi
 
-function gravity_pulsar() {
-
-# Whitelist (if applicable) domains
-if [[ -r $whitelist ]];then
+	# Whitelist (if applicable) domains
+	if [[ -r $whitelist ]];then
         # Remove whitelist entries
         numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
         plural=; [[ "$numberOf" != "1" ]] && plural=s
@@ -172,65 +188,91 @@ if [[ -r $whitelist ]];then
         # replace "." with "\." of each line to turn each entry into a
         # regexp so it can be parsed out with grep -x
         awk -F '[# \t]' 'NF>0&&$1!="" {print "^"$1"$"}' $whitelist | sed 's/\./\\./g' > $latentWhitelist
-else
-        rm $latentWhitelist
-fi
+	else
+        rm $latentWhitelist 2>/dev/null
+	fi
 
-# Prevent our sources from being pulled into the hole
-plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
-echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
-for url in ${sources[@]}
-do
+	# Prevent our sources from being pulled into the hole
+	plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
+	echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
+	for url in ${sources[@]}
+	do
         echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
-done
+	done
 
-# Remove whitelist entries from list
-grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
+	# Remove whitelist entries from list
+	grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
 }
 
 function gravity_unique() {
-        # Sort and remove duplicates
-        sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
-        numberOf=$(wc -l < $piholeDir/$eventHorizon)
-        echo "** $numberOf unique domains trapped in the event horizon."
+	# Sort and remove duplicates
+	sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
+	numberOf=$(wc -l < $piholeDir/$eventHorizon)
+	echo "** $numberOf unique domains trapped in the event horizon."
 }
+
 function gravity_hostFormat() {
-        # Format domain list as "192.168.x.x domain.com"
-        echo "** Formatting domains into a HOSTS file..."
-        cat $piholeDir/$eventHorizon | awk '{sub(/\r$/,""); print "'"$piholeIP"' " $0}' > $piholeDir/$accretionDisc
-        # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
-        cp $piholeDir/$accretionDisc $adList
+	# Format domain list as "192.168.x.x domain.com"
+	echo "** Formatting domains into a HOSTS file..."
+  # If there is a value in the $piholeIPv6, then IPv6 will be used, so the awk command modified to create a line for both protocols
+  if [[ -n $piholeIPv6 ]];then
+    cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' > $piholeDir/$accretionDisc
+  else
+    # Otherwise, just create gravity.list as normal using IPv4
+    cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' > $piholeDir/$accretionDisc
+  fi
+	# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
+	cp $piholeDir/$accretionDisc $adList
 }
+
+# blackbody - remove any remnant files from script processes
 function gravity_blackbody() {
-		for file in $piholeDir/*.$justDomainsExtension
-		do
-			if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
-				:
-			else
-				rm -f $file
-			fi
-		done
+	# Loop through list files
+	for file in $piholeDir/*.$justDomainsExtension
+	do
+		# If list is in active array then leave it (noop) else rm the list
+		if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
+			:
+		else
+			rm -f $file
+		fi
+	done
 }
+
 function gravity_advanced() {
+	# Remove comments and print only the domain name
+	# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
+	# This helps with that and makes it easier to read
+	# It also helps with debugging so each stage of the script can be researched more in depth
+	awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$andLight | \
+		sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
 
-        # Remove comments and print only the domain name
-        # Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
-        # This helps with that and makes it easier to read
-        # It also helps with debugging so each stage of the script can be researched more in depth
-        awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$andLight | \
-                        sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
+	numberOf=$(wc -l < $piholeDir/$supernova)
+	echo "** $numberOf domains being pulled in by gravity..."
 
-        numberOf=$(wc -l < $piholeDir/$supernova)
-        echo "** $numberOf domains being pulled in by gravity..."
-        gravity_unique
+	gravity_unique
+}
 
-        sudo kill -HUP $(pidof dnsmasq)
+function gravity_reload() {
+	# Reload hosts file
+	echo "** Refresh lists in dnsmasq..."
+
+	dnsmasqPid=$(pidof dnsmasq)
+
+	if [[ $dnsmasqPid ]]; then
+		# service already running - reload config
+		sudo kill -HUP $dnsmasqPid
+	else
+		# service not running, start it up
+		sudo service dnsmasq start
+	fi
 }
 
 gravity_collapse
 gravity_spinup
 gravity_Schwarzchild
 gravity_pulsar
-gravity_hostFormat
 gravity_advanced
+gravity_hostFormat
 gravity_blackbody
+gravity_reload