Parcourir la source

Retire the goog, except as the lastest resort. You know what I'm sayin

Bob Mottram il y a 7 ans
Parent
révision
0ee2753717

+ 7
- 3
src/freedombone-app-pihole Voir le fichier

@@ -135,7 +135,7 @@ function pihole_change_upstream_dns {
135 135
     data=$(tempfile 2>/dev/null)
136 136
     trap "rm -f $data" 0 1 2 5 15
137 137
     dialog --backtitle $"Ad Blocker Upstream DNS" \
138
-           --radiolist $"Pick a domain name service (DNS):" 25 50 16 \
138
+           --radiolist $"Pick a domain name service (DNS):" 26 50 17 \
139 139
            1 $"Digital Courage" on \
140 140
            2 $"German Privacy Foundation 1" off \
141 141
            3 $"German Privacy Foundation 2" off \
@@ -151,7 +151,8 @@ function pihole_change_upstream_dns {
151 151
            13 $"PowerNS" off \
152 152
            14 $"ValiDOM" off \
153 153
            15 $"Freie Unzensierte" off \
154
-           16 $"Google" off 2> $data
154
+           16 $"DNS.Watch" off \
155
+           17 $"Google" off 2> $data
155 156
     sel=$?
156 157
     case $sel in
157 158
         1) exit 1;;
@@ -203,7 +204,10 @@ function pihole_change_upstream_dns {
203 204
         15) PIHOLE_DNS1='85.25.149.144'
204 205
             PIHOLE_DNS2='87.106.37.196'
205 206
             ;;
206
-        16) PIHOLE_DNS1='8.8.8.8'
207
+        16) PIHOLE_DNS1='84.200.69.80'
208
+            PIHOLE_DNS2='84.200.70.40'
209
+            ;;
210
+        17) PIHOLE_DNS1='8.8.8.8'
207 211
             PIHOLE_DNS2='4.4.4.4'
208 212
             ;;
209 213
         255) exit 1;;

+ 2
- 2
src/freedombone-image Voir le fichier

@@ -87,8 +87,8 @@ NAMESERVER1='213.73.91.35'
87 87
 NAMESERVER2='85.214.20.141'
88 88
 NAMESERVER3='213.73.91.35'
89 89
 NAMESERVER4='85.214.73.63'
90
-NAMESERVER5='8.8.8.8'
91
-NAMESERVER6='4.4.4.4'
90
+NAMESERVER5='84.200.69.80'
91
+NAMESERVER6='84.200.70.40'
92 92
 
93 93
 # An optional freedombone configuration file
94 94
 CONFIG_FILENAME=

+ 2
- 2
src/freedombone-image-makefile Voir le fichier

@@ -64,8 +64,8 @@ NAMESERVER1 ?= '213.73.91.35'
64 64
 NAMESERVER2 ?= '85.214.20.141'
65 65
 NAMESERVER3 ?= '213.73.91.35'
66 66
 NAMESERVER4 ?= '85.214.73.63'
67
-NAMESERVER5 ?= '8.8.8.8'
68
-NAMESERVER6 ?= '4.4.4.4'
67
+NAMESERVER5 ?= '84.200.69.80'
68
+NAMESERVER6 ?= '84.200.70.40'
69 69
 
70 70
 # Using taskset to pin build process to single core. This is a
71 71
 # workaround for a qemu-user-static issue that causes builds to

+ 2
- 2
src/freedombone-utils-dns Voir le fichier

@@ -33,8 +33,8 @@ NAMESERVER1='213.73.91.35'
33 33
 NAMESERVER2='85.214.20.141'
34 34
 NAMESERVER3='213.73.91.35'
35 35
 NAMESERVER4='85.214.73.63'
36
-NAMESERVER5='8.8.8.8'
37
-NAMESERVER6='4.4.4.4'
36
+NAMESERVER5='84.200.69.80'
37
+NAMESERVER6='84.200.70.40'
38 38
 
39 39
 # parameters used when adding a new domain
40 40
 DDNS_PROVIDER="default@freedns.afraid.org"