Ver código fonte

Add another dns option

Bob Mottram 7 anos atrás
pai
commit
ead20fe57b

+ 47
- 43
src/freedombone-app-pihole Ver arquivo

@@ -37,8 +37,8 @@ IN_DEFAULT_INSTALL=0
37 37
 SHOW_ON_ABOUT=0
38 38
 
39 39
 PIHOLE_IFACE=eth0
40
-PIHOLE_DNS1='85.214.73.63'
41
-PIHOLE_DNS2='213.73.91.35'
40
+PIHOLE_DNS1='91.239.100.100'
41
+PIHOLE_DNS2='89.233.43.71'
42 42
 
43 43
 piholeBasename=pihole
44 44
 piholeDir=/etc/$piholeBasename
@@ -134,26 +134,27 @@ function pihole_update {
134 134
 function pihole_change_upstream_dns {
135 135
     data=$(mktemp 2>/dev/null)
136 136
     dialog --backtitle $"Ad Blocker Upstream DNS" \
137
-           --radiolist $"Pick a domain name service (DNS):" 28 50 19 \
138
-           1 $"Digital Courage" on \
139
-           2 $"German Privacy Foundation 1" off \
140
-           3 $"German Privacy Foundation 2" off \
141
-           4 $"Chaos Computer Club" off \
142
-           5 $"ClaraNet" off \
143
-           6 $"OpenNIC 1" off \
144
-           7 $"OpenNIC 2" off \
145
-           8 $"OpenNIC 3" off \
146
-           9 $"OpenNIC 4" off \
147
-           10 $"OpenNIC 5" off \
148
-           11 $"OpenNIC 6" off \
149
-           12 $"OpenNIC 7" off \
150
-           13 $"PowerNS" off \
151
-           14 $"ValiDOM" off \
152
-           15 $"Freie Unzensierte" off \
153
-           16 $"DNS.Watch" off \
154
-           17 $"uncensoreddns.org" off \
155
-           18 $"Lorraine Data Network" off \
156
-           19 $"Google" off 2> "$data"
137
+           --radiolist $"Pick a domain name service (DNS):" 29 50 20 \
138
+           1 $"UncensoredDNS" on \
139
+           2 $"Digital Courage" off \
140
+           3 $"German Privacy Foundation 1" off \
141
+           4 $"German Privacy Foundation 2" off \
142
+           5 $"Chaos Computer Club" off \
143
+           6 $"ClaraNet" off \
144
+           7 $"OpenNIC 1" off \
145
+           8 $"OpenNIC 2" off \
146
+           9 $"OpenNIC 3" off \
147
+           10 $"OpenNIC 4" off \
148
+           11 $"OpenNIC 5" off \
149
+           12 $"OpenNIC 6" off \
150
+           13 $"OpenNIC 7" off \
151
+           14 $"PowerNS" off \
152
+           15 $"ValiDOM" off \
153
+           16 $"Freie Unzensierte" off \
154
+           17 $"DNS.Watch" off \
155
+           18 $"uncensoreddns.org" off \
156
+           19 $"Lorraine Data Network" off \
157
+           20 $"Google" off 2> "$data"
157 158
     sel=$?
158 159
     case $sel in
159 160
         1) rm -f "$data"
@@ -162,61 +163,64 @@ function pihole_change_upstream_dns {
162 163
              exit 1;;
163 164
     esac
164 165
     case $(cat "$data") in
165
-        1) PIHOLE_DNS1='85.214.73.63'
166
+        1) PIHOLE_DNS1='91.239.100.100'
167
+           PIHOLE_DNS2='89.233.43.71'
168
+           ;;
169
+        2) PIHOLE_DNS1='85.214.73.63'
166 170
            PIHOLE_DNS2='213.73.91.35'
167 171
            ;;
168
-        2) PIHOLE_DNS1='87.118.100.175'
172
+        3) PIHOLE_DNS1='87.118.100.175'
169 173
            PIHOLE_DNS2='94.75.228.29'
170 174
            ;;
171
-        3) PIHOLE_DNS1='85.25.251.254'
175
+        4) PIHOLE_DNS1='85.25.251.254'
172 176
            PIHOLE_DNS2='2.141.58.13'
173 177
            ;;
174
-        4) PIHOLE_DNS1='213.73.91.35'
178
+        5) PIHOLE_DNS1='213.73.91.35'
175 179
            PIHOLE_DNS2='85.214.73.63'
176 180
            ;;
177
-        5) PIHOLE_DNS1='212.82.225.7'
181
+        6) PIHOLE_DNS1='212.82.225.7'
178 182
            PIHOLE_DNS2='212.82.226.212'
179 183
            ;;
180
-        6) PIHOLE_DNS1='58.6.115.42'
184
+        7) PIHOLE_DNS1='58.6.115.42'
181 185
            PIHOLE_DNS2='58.6.115.43'
182 186
            ;;
183
-        7) PIHOLE_DNS1='119.31.230.42'
187
+        8) PIHOLE_DNS1='119.31.230.42'
184 188
            PIHOLE_DNS2='200.252.98.162'
185 189
            ;;
186
-        8) PIHOLE_DNS1='217.79.186.148'
190
+        9) PIHOLE_DNS1='217.79.186.148'
187 191
            PIHOLE_DNS2='81.89.98.6'
188 192
            ;;
189
-        9) PIHOLE_DNS1='78.159.101.37'
190
-           PIHOLE_DNS2='203.167.220.153'
191
-           ;;
192
-        10) PIHOLE_DNS1='82.229.244.191'
193
+        10) PIHOLE_DNS1='78.159.101.37'
194
+            PIHOLE_DNS2='203.167.220.153'
195
+            ;;
196
+        11) PIHOLE_DNS1='82.229.244.191'
193 197
             PIHOLE_DNS2='82.229.244.191'
194 198
             ;;
195
-        11) PIHOLE_DNS1='216.87.84.211'
199
+        12) PIHOLE_DNS1='216.87.84.211'
196 200
             PIHOLE_DNS2='66.244.95.20'
197 201
             ;;
198
-        12) PIHOLE_DNS1='207.192.69.155'
202
+        13) PIHOLE_DNS1='207.192.69.155'
199 203
             PIHOLE_DNS2='72.14.189.120'
200 204
             ;;
201
-        13) PIHOLE_DNS1='194.145.226.26'
205
+        14) PIHOLE_DNS1='194.145.226.26'
202 206
             PIHOLE_DNS2='77.220.232.44'
203 207
             ;;
204
-        14) PIHOLE_DNS1='78.46.89.147'
208
+        15) PIHOLE_DNS1='78.46.89.147'
205 209
             PIHOLE_DNS2='88.198.75.145'
206 210
             ;;
207
-        15) PIHOLE_DNS1='85.25.149.144'
211
+        16) PIHOLE_DNS1='85.25.149.144'
208 212
             PIHOLE_DNS2='87.106.37.196'
209 213
             ;;
210
-        16) PIHOLE_DNS1='84.200.69.80'
214
+        17) PIHOLE_DNS1='84.200.69.80'
211 215
             PIHOLE_DNS2='84.200.70.40'
212 216
             ;;
213
-        17) PIHOLE_DNS1='91.239.100.100'
217
+        18) PIHOLE_DNS1='91.239.100.100'
214 218
             PIHOLE_DNS2='89.233.43.71'
215 219
             ;;
216
-        18) PIHOLE_DNS1='80.67.188.188'
220
+        19) PIHOLE_DNS1='80.67.188.188'
217 221
             PIHOLE_DNS2='89.234.141.66'
218 222
             ;;
219
-        19) PIHOLE_DNS1='8.8.8.8'
223
+        20) PIHOLE_DNS1='8.8.8.8'
220 224
             PIHOLE_DNS2='4.4.4.4'
221 225
             dialog --title $"WARNING" \
222 226
                    --msgbox $"\\nGoogle's main purpose for providing DNS resolvers is to spy upon people and know which sites they are visiting.\\n\\nThis is something to consider, and you should only really be using Google DNS as a last resort if other resolvers are unavailable." 12 60

+ 2
- 2
src/freedombone-app-vpn Ver arquivo

@@ -688,8 +688,8 @@ function install_vpn {
688 688
       echo 'dh /etc/openvpn/dh2048.pem';
689 689
       echo 'server 10.8.0.0 255.255.255.0';
690 690
       echo 'push "redirect-gateway def1 bypass-dhcp"';
691
-      echo "push \"dhcp-option DNS 85.214.73.63\"";
692
-      echo "push \"dhcp-option DNS 213.73.91.35\"";
691
+      echo "push \"dhcp-option DNS 91.239.100.100\"";
692
+      echo "push \"dhcp-option DNS 89.233.43.71\"";
693 693
       echo 'keepalive 5 30';
694 694
       echo 'comp-lzo';
695 695
       echo 'persist-key';

+ 2
- 2
src/freedombone-image Ver arquivo

@@ -83,8 +83,8 @@ ROUTER_IP_ADDRESS="192.168.1.254"
83 83
 BOX_IP_ADDRESS="192.168.1.55"
84 84
 
85 85
 # DNS
86
-NAMESERVER1='213.73.91.35'
87
-NAMESERVER2='85.214.20.141'
86
+NAMESERVER1='91.239.100.100'
87
+NAMESERVER2='89.233.43.71'
88 88
 NAMESERVER3='213.73.91.35'
89 89
 NAMESERVER4='85.214.73.63'
90 90
 NAMESERVER5='84.200.69.80'

+ 2
- 2
src/freedombone-image-customise Ver arquivo

@@ -62,8 +62,8 @@ ROUTER_IP_ADDRESS="192.168.1.254"
62 62
 BOX_IP_ADDRESS="192.168.1.55"
63 63
 
64 64
 # DNS
65
-NAMESERVER1='85.214.73.63'
66
-NAMESERVER2='213.73.91.35'
65
+NAMESERVER1='91.239.100.100'
66
+NAMESERVER2='89.233.43.71'
67 67
 NAMESERVER3='87.118.100.175'
68 68
 NAMESERVER4='94.75.228.29'
69 69
 NAMESERVER5='85.25.251.254'

+ 2
- 2
src/freedombone-image-makefile Ver arquivo

@@ -60,8 +60,8 @@ ROUTER_IP_ADDRESS ?= "192.168.1.254"
60 60
 BOX_IP_ADDRESS ?= "192.168.1.55"
61 61
 
62 62
 # DNS
63
-NAMESERVER1 ?= '213.73.91.35'
64
-NAMESERVER2 ?= '85.214.20.141'
63
+NAMESERVER1 ?= '91.239.100.100'
64
+NAMESERVER2 ?= '89.233.43.71'
65 65
 NAMESERVER3 ?= '213.73.91.35'
66 66
 NAMESERVER4 ?= '85.214.73.63'
67 67
 NAMESERVER5 ?= '84.200.69.80'

+ 2
- 2
src/freedombone-utils-dns Ver arquivo

@@ -29,8 +29,8 @@
29 29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30 30
 
31 31
 # DNS
32
-NAMESERVER1='85.214.73.63'
33
-NAMESERVER2='213.73.91.35'
32
+NAMESERVER1='91.239.100.100'
33
+NAMESERVER2='89.233.43.71'
34 34
 NAMESERVER3='87.118.100.175'
35 35
 NAMESERVER4='94.75.228.29'
36 36
 NAMESERVER5='85.25.251.254'