Merge pull request #2037 from justinamcafee/master

Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
This commit is contained in:
Mark Drobnak 2018-03-21 17:47:24 -04:00 committed by GitHub
commit e131395cce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -771,6 +771,7 @@ setDNS() {
Comodo "" Comodo ""
DNSWatch "" DNSWatch ""
Quad9 "" Quad9 ""
FamilyShield ""
Custom "") Custom "")
# In a whiptail dialog, show the options # In a whiptail dialog, show the options
DNSchoices=$(whiptail --separate-output --menu "Select Upstream DNS Provider. To use your own, select Custom." ${r} ${c} 7 \ DNSchoices=$(whiptail --separate-output --menu "Select Upstream DNS Provider. To use your own, select Custom." ${r} ${c} 7 \
@ -817,6 +818,11 @@ setDNS() {
PIHOLE_DNS_1="9.9.9.9" PIHOLE_DNS_1="9.9.9.9"
PIHOLE_DNS_2="149.112.112.112" PIHOLE_DNS_2="149.112.112.112"
;; ;;
FamilyShield)
echo "FamilyShield servers"
PIHOLE_DNS_1="208.67.222.123"
PIHOLE_DNS_2="208.67.220.123"
;;
Custom) Custom)
# Until the DNS settings are selected, # Until the DNS settings are selected,
until [[ "${DNSSettingsCorrect}" = True ]]; do until [[ "${DNSSettingsCorrect}" = True ]]; do