mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-25 14:20:18 +00:00
Merge pull request #2354 from realtebo/development
Create adlist file while running unattended setup
This commit is contained in:
commit
eb8e4496b2
1 changed files with 35 additions and 10 deletions
|
@ -1087,19 +1087,42 @@ chooseBlocklists() {
|
||||||
# For each choice available,
|
# For each choice available,
|
||||||
for choice in ${choices}
|
for choice in ${choices}
|
||||||
do
|
do
|
||||||
# Set the values to true
|
appendToListsFile choice
|
||||||
case ${choice} in
|
|
||||||
StevenBlack ) echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >> "${adlistFile}";;
|
|
||||||
MalwareDom ) echo "https://mirror1.malwaredomains.com/files/justdomains" >> "${adlistFile}";;
|
|
||||||
Cameleon ) echo "http://sysctl.org/cameleon/hosts" >> "${adlistFile}";;
|
|
||||||
ZeusTracker ) echo "https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist" >> "${adlistFile}";;
|
|
||||||
DisconTrack ) echo "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" >> "${adlistFile}";;
|
|
||||||
DisconAd ) echo "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" >> "${adlistFile}";;
|
|
||||||
HostsFile ) echo "https://hosts-file.net/ad_servers.txt" >> "${adlistFile}";;
|
|
||||||
esac
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Accept a string parameter, it must be one of the default lists
|
||||||
|
# This function allow to not duplicate code in chooseBlocklists and
|
||||||
|
# in installDefaultBlocklists
|
||||||
|
appendToListsFile() {
|
||||||
|
case $1 in
|
||||||
|
StevenBlack ) echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >> "${adlistFile}";;
|
||||||
|
MalwareDom ) echo "https://mirror1.malwaredomains.com/files/justdomains" >> "${adlistFile}";;
|
||||||
|
Cameleon ) echo "http://sysctl.org/cameleon/hosts" >> "${adlistFile}";;
|
||||||
|
ZeusTracker ) echo "https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist" >> "${adlistFile}";;
|
||||||
|
DisconTrack ) echo "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" >> "${adlistFile}";;
|
||||||
|
DisconAd ) echo "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" >> "${adlistFile}";;
|
||||||
|
HostsFile ) echo "https://hosts-file.net/ad_servers.txt" >> "${adlistFile}";;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
# Used only in unattended setup
|
||||||
|
# If there is already the adListFile, we keep it, else we create it using all default lists
|
||||||
|
installDefaultBlocklists() {
|
||||||
|
# In unattended setup, could be useful to use userdefined blocklist.
|
||||||
|
# If this file exists, we avoid overriding it.
|
||||||
|
if [[ -f "${adlistFile}" ]]; then
|
||||||
|
return;
|
||||||
|
fi
|
||||||
|
appendToListsFile StevenBlack
|
||||||
|
appendToListsFile MalwareDom
|
||||||
|
appendToListsFile Cameleon
|
||||||
|
appendToListsFile ZeusTracker
|
||||||
|
appendToListsFile DisconTrack
|
||||||
|
appendToListsFile DisconAd
|
||||||
|
appendToListsFile HostsFile
|
||||||
|
}
|
||||||
|
|
||||||
# Check if /etc/dnsmasq.conf is from pi-hole. If so replace with an original and install new in .d directory
|
# Check if /etc/dnsmasq.conf is from pi-hole. If so replace with an original and install new in .d directory
|
||||||
version_check_dnsmasq() {
|
version_check_dnsmasq() {
|
||||||
# Local, named variables
|
# Local, named variables
|
||||||
|
@ -2391,6 +2414,8 @@ main() {
|
||||||
# Let the user decide if they want query logging enabled...
|
# Let the user decide if they want query logging enabled...
|
||||||
setLogging
|
setLogging
|
||||||
else
|
else
|
||||||
|
# Setup adlist file if not exists
|
||||||
|
installDefaultBlocklists
|
||||||
# Source ${setupVars} to use predefined user variables in the functions
|
# Source ${setupVars} to use predefined user variables in the functions
|
||||||
source ${setupVars}
|
source ${setupVars}
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue