From f12200edd54f9ae45f605ad1423728248be9db35 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 7 Dec 2016 17:02:20 +0000
Subject: [PATCH] Have a fixed nameserver list

---
 src/freedombone-config | 87 ------------------------------------------
 1 file changed, 87 deletions(-)

diff --git a/src/freedombone-config b/src/freedombone-config
index c62320d5..1396fffc 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -348,92 +348,6 @@ function choose_dynamic_dns {
     fi
 }
 
-function choose_dns {
-    if [[ $MINIMAL_INSTALL == "no" && $ONION_ONLY == "no" ]]; then
-        data=$(tempfile 2>/dev/null)
-        trap "rm -f $data" 0 1 2 5 15
-        dialog --backtitle $"Freedombone Configuration" \
-               --radiolist $"Pick a domain name service (DNS):" 25 50 16 \
-               1 $"Digital Courage" on \
-               2 $"German Privacy Foundation 1" off \
-               3 $"German Privacy Foundation 2" off \
-               4 $"Chaos Computer Club" off \
-               5 $"ClaraNet" off \
-               6 $"OpenNIC 1" off \
-               7 $"OpenNIC 2" off \
-               8 $"OpenNIC 3" off \
-               9 $"OpenNIC 4" off \
-               10 $"OpenNIC 5" off \
-               11 $"OpenNIC 6" off \
-               12 $"OpenNIC 7" off \
-               13 $"PowerNS" off \
-               14 $"ValiDOM" off \
-               15 $"Freie Unzensierte" off \
-               16 $"Google" off 2> $data
-        sel=$?
-        case $sel in
-            1) exit 1;;
-            255) exit 1;;
-        esac
-        case $(cat $data) in
-            1) NAMESERVER1='85.214.73.63'
-               NAMESERVER2='213.73.91.35'
-               ;;
-            2) NAMESERVER1='87.118.100.175'
-               NAMESERVER2='94.75.228.29'
-               ;;
-            3) NAMESERVER1='85.25.251.254'
-               NAMESERVER2='2.141.58.13'
-               ;;
-            4) NAMESERVER1='213.73.91.35'
-               NAMESERVER2='85.214.73.63'
-               ;;
-            5) NAMESERVER1='212.82.225.7'
-               NAMESERVER2='212.82.226.212'
-               ;;
-            6) NAMESERVER1='58.6.115.42'
-               NAMESERVER2='58.6.115.43'
-               ;;
-            7) NAMESERVER1='119.31.230.42'
-               NAMESERVER2='200.252.98.162'
-               ;;
-            8) NAMESERVER1='217.79.186.148'
-               NAMESERVER2='81.89.98.6'
-               ;;
-            9) NAMESERVER1='78.159.101.37'
-               NAMESERVER2='203.167.220.153'
-               ;;
-            10) NAMESERVER1='82.229.244.191'
-                NAMESERVER2='82.229.244.191'
-                ;;
-            11) NAMESERVER1='216.87.84.211'
-                NAMESERVER2='66.244.95.20'
-                ;;
-            12) NAMESERVER1='207.192.69.155'
-                NAMESERVER2='72.14.189.120'
-                ;;
-            13) NAMESERVER1='194.145.226.26'
-                NAMESERVER2='77.220.232.44'
-                ;;
-            14) NAMESERVER1='78.46.89.147'
-                NAMESERVER2='88.198.75.145'
-                ;;
-            15) NAMESERVER1='85.25.149.144'
-                NAMESERVER2='87.106.37.196'
-                ;;
-            16) NAMESERVER1='8.8.8.8'
-                NAMESERVER2='4.4.4.4'
-                ;;
-            255) exit 1;;
-        esac
-        save_configuration_values
-    else
-        # as defaults for a minimal install process these settings are debatable
-        NAMESERVER1='85.214.73.63'
-        NAMESERVER2='213.73.91.35'
-    fi
-}
-
 function choose_debian_repo {
     if [[ $MINIMAL_INSTALL == "no" ]]; then
         data=$(tempfile 2>/dev/null)
@@ -1062,7 +976,6 @@ function interactive_config {
     choose_social_key_management
     choose_rng
     choose_debian_repo
-    choose_dns
     ${PROJECT_NAME}-wifi --networksinteractive $WIFI_NETWORKS_FILE
     choose_dynamic_dns
     choose_default_domain_name