Merge pull request #20 from rmceoin/master

If exists, import a config file to allow for overriding script variables.

advanced/dnsmasq.conf

@@ -6,4 +6,5 @@ server=8.8.4.4
 interface=eth0
 listen-address=127.0.0.1
 cache-size=10000
-log-queries
+log-queries
+local-ttl=300

gravity.sh

@@ -16,8 +16,13 @@ sources=('https://adaway.org/hosts.txt'
 'http://winhelp2002.mvps.org/hosts.txt')
 
 # Variables for various stages of downloading and formatting the list
+adList=/etc/hosts
 origin=/etc/pihole
 piholeDir=/etc/pihole
+if [[ -f $piholeDir/pihole.conf ]]; then
+	. $piholeDir/pihole.conf
+fi
+
 justDomainsExtension=domains
 matter=pihole.0.matter.txt
 andLight=pihole.1.andLight.txt
@@ -25,7 +30,6 @@ supernova=pihole.2.supernova.txt
 eventHorizon=pihole.3.eventHorizon.txt
 accretionDisc=pihole.4.accretionDisc.txt
 eyeOfTheNeedle=pihole.5.wormhole.txt
-adList=/etc/hosts
 blacklist=$piholeDir/blacklist.txt
 latentBlacklist=$origin/latentBlacklist.txt
 whitelist=$piholeDir/whitelist.txt
@@ -120,4 +124,4 @@ if [[ -f $whitelist ]];then
 else
 	cat $origin/$matter > $origin/$andLight
 	gravity_advanced
-fi
+fi