Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 15:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'UninstallFix' of github.com:pi-hole/pi-hole into UninstallFix

Browse source
This commit is contained in:
Promofaux 2016-02-11 16:27:16 +00:00
commit 1b76bf3e48
2 changed files with 79 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adlists.default
View file

@ -6,3 +6,12 @@ http://pgl.yoyo.org/adservers/serverlist.php?
http://someonewhocares.org/hosts/hosts http://someonewhocares.org/hosts/hosts
http://winhelp2002.mvps.org/hosts.txt http://winhelp2002.mvps.org/hosts.txt
http://mirror1.malwaredomains.com/files/justdomains http://mirror1.malwaredomains.com/files/justdomains
http://securemecca.com/Downloads/hosts.txt
https://hosts.neocities.org/
http://sysctl.org/cameleon/hosts
https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
http://optimate.dl.sourceforge.net/project/adzhosts/HOSTS.txt
https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt

4
automated install/basic-install.sh
View file

@ -145,10 +145,8 @@ chooseInterface() {
echo "::: Cancel selected, exiting...." echo "::: Cancel selected, exiting...."
exit 1 exit 1
fi fi
} }
use4andor6() { use4andor6() {
# Let use select IPv4 and/or IPv6 # Let use select IPv4 and/or IPv6
cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2) cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
@ -467,7 +465,6 @@ update_repo() {
echo " done!" echo " done!"
} }
CreateLogFile() { CreateLogFile() {
# Create logfiles if necessary # Create logfiles if necessary
echo ":::" echo ":::"
@ -519,7 +516,6 @@ runGravity() {
/usr/local/bin/gravity.sh /usr/local/bin/gravity.sh
} }
installPihole() { installPihole() {
# Install base files and web interface # Install base files and web interface
checkForDependencies # done checkForDependencies # done