Merge github.com:pi-hole/pi-hole

This commit is contained in:
Promofaux 2016-02-01 22:19:37 +00:00
commit 8b76bbe51d
2 changed files with 5 additions and 6 deletions

View file

@ -279,9 +279,9 @@ setStaticIPv4() {
} }
setDNS(){ setDNS(){
DNSChoseCmd=(whiptail --separate-output --radiolist "Select DNS Servers" $r $c 2) DNSChoseCmd=(whiptail --separate-output --radiolist "Select Upstream DNS Provider" $r $c 2)
DNSChooseOptions=(Google "Use Google's DNS Servers" on DNSChooseOptions=(Google "" on
DynDNS "Use DynDNS's DNS Servers" off) OpenDNS "" off)
DNSchoices=$("${DNSChoseCmd[@]}" "${DNSChooseOptions[@]}" 2>&1 >/dev/tty) DNSchoices=$("${DNSChoseCmd[@]}" "${DNSChooseOptions[@]}" 2>&1 >/dev/tty)
if [[ $? = 0 ]];then if [[ $? = 0 ]];then
case $DNSchoices in case $DNSchoices in
@ -290,8 +290,8 @@ setDNS(){
piholeDNS1="8.8.8.8" piholeDNS1="8.8.8.8"
piholeDNS2="8.8.4.4" piholeDNS2="8.8.4.4"
;; ;;
DynDNS) OpenDNS)
echo "::: Using DynDNS servers." echo "::: Using OpenDNS servers."
piholeDNS1="208.67.222.222" piholeDNS1="208.67.222.222"
piholeDNS2="208.67.220.220" piholeDNS2="208.67.220.220"
;; ;;

View file

@ -1 +0,0 @@
2.4