mirror of
https://github.com/moparisthebest/pi-hole
synced 2024-11-12 04:15:03 -05:00
Merge pull request #20 from rmceoin/master
If exists, import a config file to allow for overriding script variables.
This commit is contained in:
commit
019e1228ab
@ -6,4 +6,5 @@ server=8.8.4.4
|
|||||||
interface=eth0
|
interface=eth0
|
||||||
listen-address=127.0.0.1
|
listen-address=127.0.0.1
|
||||||
cache-size=10000
|
cache-size=10000
|
||||||
log-queries
|
log-queries
|
||||||
|
local-ttl=300
|
||||||
|
@ -16,8 +16,13 @@ sources=('https://adaway.org/hosts.txt'
|
|||||||
'http://winhelp2002.mvps.org/hosts.txt')
|
'http://winhelp2002.mvps.org/hosts.txt')
|
||||||
|
|
||||||
# Variables for various stages of downloading and formatting the list
|
# Variables for various stages of downloading and formatting the list
|
||||||
|
adList=/etc/hosts
|
||||||
origin=/etc/pihole
|
origin=/etc/pihole
|
||||||
piholeDir=/etc/pihole
|
piholeDir=/etc/pihole
|
||||||
|
if [[ -f $piholeDir/pihole.conf ]]; then
|
||||||
|
. $piholeDir/pihole.conf
|
||||||
|
fi
|
||||||
|
|
||||||
justDomainsExtension=domains
|
justDomainsExtension=domains
|
||||||
matter=pihole.0.matter.txt
|
matter=pihole.0.matter.txt
|
||||||
andLight=pihole.1.andLight.txt
|
andLight=pihole.1.andLight.txt
|
||||||
@ -25,7 +30,6 @@ supernova=pihole.2.supernova.txt
|
|||||||
eventHorizon=pihole.3.eventHorizon.txt
|
eventHorizon=pihole.3.eventHorizon.txt
|
||||||
accretionDisc=pihole.4.accretionDisc.txt
|
accretionDisc=pihole.4.accretionDisc.txt
|
||||||
eyeOfTheNeedle=pihole.5.wormhole.txt
|
eyeOfTheNeedle=pihole.5.wormhole.txt
|
||||||
adList=/etc/hosts
|
|
||||||
blacklist=$piholeDir/blacklist.txt
|
blacklist=$piholeDir/blacklist.txt
|
||||||
latentBlacklist=$origin/latentBlacklist.txt
|
latentBlacklist=$origin/latentBlacklist.txt
|
||||||
whitelist=$piholeDir/whitelist.txt
|
whitelist=$piholeDir/whitelist.txt
|
||||||
@ -120,4 +124,4 @@ if [[ -f $whitelist ]];then
|
|||||||
else
|
else
|
||||||
cat $origin/$matter > $origin/$andLight
|
cat $origin/$matter > $origin/$andLight
|
||||||
gravity_advanced
|
gravity_advanced
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user