Explorar el Código

More dns nameservers

Bob Mottram hace 8 años
padre
commit
7359cdd64a

+ 20
- 0
src/freedombone Ver fichero

@@ -219,6 +219,26 @@ else
219 219
                 shift
220 220
                 NAMESERVER2=$1
221 221
                 ;;
222
+            # DNS Nameserver 3
223
+            --ns3)
224
+                shift
225
+                NAMESERVER3=$1
226
+                ;;
227
+            # DNS Nameserver 4
228
+            --ns4)
229
+                shift
230
+                NAMESERVER4=$1
231
+                ;;
232
+            # DNS Nameserver 5
233
+            --ns5)
234
+                shift
235
+                NAMESERVER5=$1
236
+                ;;
237
+            # DNS Nameserver 6
238
+            --ns6)
239
+                shift
240
+                NAMESERVER6=$1
241
+                ;;
222 242
             # Debian repository
223 243
             --repo)
224 244
                 shift

+ 32
- 0
src/freedombone-image Ver fichero

@@ -85,6 +85,10 @@ BOX_IP_ADDRESS="192.168.1.55"
85 85
 # DNS
86 86
 NAMESERVER1='213.73.91.35'
87 87
 NAMESERVER2='85.214.20.141'
88
+NAMESERVER3='213.73.91.35'
89
+NAMESERVER4='85.214.73.63'
90
+NAMESERVER5='8.8.8.8'
91
+NAMESERVER6='4.4.4.4'
88 92
 
89 93
 # An optional freedombone configuration file
90 94
 CONFIG_FILENAME=
@@ -274,6 +278,10 @@ function mesh_router_setup_script {
274 278
     echo 'DEBIAN_REPO=' >> $mesh_script_filename
275 279
     echo 'NAMESERVER1=' >> $mesh_script_filename
276 280
     echo 'NAMESERVER2=' >> $mesh_script_filename
281
+    echo 'NAMESERVER3=' >> $mesh_script_filename
282
+    echo 'NAMESERVER4=' >> $mesh_script_filename
283
+    echo 'NAMESERVER5=' >> $mesh_script_filename
284
+    echo 'NAMESERVER6=' >> $mesh_script_filename
277 285
     echo 'BATMAN_CELLID=any' >> $mesh_script_filename
278 286
     echo 'WIFI_CHANNEL=9' >> $mesh_script_filename
279 287
 }
@@ -340,6 +348,26 @@ do
340 348
             shift
341 349
             NAMESERVER2="$1"
342 350
             ;;
351
+        # nameserver 3
352
+        --ns3|--nameserver3)
353
+            shift
354
+            NAMESERVER2="$1"
355
+            ;;
356
+        # nameserver 4
357
+        --ns4|--nameserver4)
358
+            shift
359
+            NAMESERVER4="$1"
360
+            ;;
361
+        # nameserver 5
362
+        --ns5|--nameserver5)
363
+            shift
364
+            NAMESERVER5="$1"
365
+            ;;
366
+        # nameserver 6
367
+        --ns6|--nameserver6)
368
+            shift
369
+            NAMESERVER6="$1"
370
+            ;;
343 371
         -i|--interactive)
344 372
             shift
345 373
             INTERACTIVE="$1"
@@ -526,6 +554,10 @@ make $IMAGE_TYPE \
526 554
      BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
527 555
      NAMESERVER1="$NAMESERVER1" \
528 556
      NAMESERVER2="$NAMESERVER2" \
557
+     NAMESERVER3="$NAMESERVER3" \
558
+     NAMESERVER4="$NAMESERVER4" \
559
+     NAMESERVER5="$NAMESERVER5" \
560
+     NAMESERVER6="$NAMESERVER6" \
529 561
      PROJECT_NAME="$PROJECT_NAME" \
530 562
      CONFIG_FILENAME="$CONFIG_FILENAME" \
531 563
      IMAGE_SIZE="$IMAGE_SIZE" \

+ 9
- 1
src/freedombone-image-make Ver fichero

@@ -54,6 +54,10 @@ export ROUTER_IP_ADDRESS
54 54
 export BOX_IP_ADDRESS
55 55
 export NAMESERVER1
56 56
 export NAMESERVER2
57
+export NAMESERVER3
58
+export NAMESERVER4
59
+export NAMESERVER5
60
+export NAMESERVER6
57 61
 export PROJECT_NAME
58 62
 export CONFIG_FILENAME
59 63
 export SSH_PUBKEY
@@ -200,7 +204,11 @@ fi
200 204
 sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
201 205
 sed -i "s|BOX_IP_ADDRESS=.*|BOX_IP_ADDRESS=${BOX_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
202 206
 sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE3
203
-sed -i "s|NAMESERVER2=.*|NAMESERVER2=${NAMESERVER1}|g" $TEMP_CUSTOMISE3
207
+sed -i "s|NAMESERVER2=.*|NAMESERVER2=${NAMESERVER2}|g" $TEMP_CUSTOMISE3
208
+sed -i "s|NAMESERVER3=.*|NAMESERVER3=${NAMESERVER3}|g" $TEMP_CUSTOMISE3
209
+sed -i "s|NAMESERVER4=.*|NAMESERVER4=${NAMESERVER4}|g" $TEMP_CUSTOMISE3
210
+sed -i "s|NAMESERVER5=.*|NAMESERVER5=${NAMESERVER5}|g" $TEMP_CUSTOMISE3
211
+sed -i "s|NAMESERVER6=.*|NAMESERVER6=${NAMESERVER6}|g" $TEMP_CUSTOMISE3
204 212
 sed -i "s|PROJECT_NAME=.*|PROJECT_NAME=${PROJECT_NAME}|g" $TEMP_CUSTOMISE3
205 213
 sed -i "s|CONFIG_FILENAME=.*|CONFIG_FILENAME=${CONFIG_FILENAME}|g" $TEMP_CUSTOMISE3
206 214
 sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE3

+ 8
- 0
src/freedombone-image-makefile Ver fichero

@@ -62,6 +62,10 @@ BOX_IP_ADDRESS ?= "192.168.1.55"
62 62
 # DNS
63 63
 NAMESERVER1 ?= '213.73.91.35'
64 64
 NAMESERVER2 ?= '85.214.20.141'
65
+NAMESERVER3 ?= '213.73.91.35'
66
+NAMESERVER4 ?= '85.214.73.63'
67
+NAMESERVER5 ?= '8.8.8.8'
68
+NAMESERVER6 ?= '4.4.4.4'
65 69
 
66 70
 # Using taskset to pin build process to single core. This is a
67 71
 # workaround for a qemu-user-static issue that causes builds to
@@ -75,6 +79,10 @@ MAKE_IMAGE = ARCHITECTURE=$(ARCHITECTURE) MACHINE=$(MACHINE) SOURCE=$(SOURCE) \
75 79
     BOX_IP_ADDRESS=$(BOX_IP_ADDRESS) \
76 80
     NAMESERVER1=$(NAMESERVER1) \
77 81
     NAMESERVER2=$(NAMESERVER2) \
82
+    NAMESERVER3=$(NAMESERVER3) \
83
+    NAMESERVER4=$(NAMESERVER4) \
84
+    NAMESERVER5=$(NAMESERVER5) \
85
+    NAMESERVER6=$(NAMESERVER6) \
78 86
     CUSTOM_SETUP=$(CUSTOM_SETUP) \
79 87
     IMAGE_SIZE=$(IMAGE_SIZE) taskset 0x01 $(PROJECT_NAME)-image-make $(NAME)
80 88
 

+ 4
- 0
src/freedombone-utils-config Ver fichero

@@ -51,6 +51,10 @@ configuration_variables=(FRIENDS_MIRRORS_SERVER
51 51
                          XMPP_DOMAIN_CODE
52 52
                          NAMESERVER1
53 53
                          NAMESERVER2
54
+                         NAMESERVER3
55
+                         NAMESERVER4
56
+                         NAMESERVER5
57
+                         NAMESERVER6
54 58
                          GET_IP_ADDRESS_URL
55 59
                          DDNS_PROVIDER
56 60
                          DDNS_USERNAME

+ 8
- 0
src/freedombone-utils-dns Ver fichero

@@ -31,6 +31,10 @@
31 31
 # DNS
32 32
 NAMESERVER1='213.73.91.35'
33 33
 NAMESERVER2='85.214.20.141'
34
+NAMESERVER3='213.73.91.35'
35
+NAMESERVER4='85.214.73.63'
36
+NAMESERVER5='8.8.8.8'
37
+NAMESERVER6='4.4.4.4'
34 38
 
35 39
 # parameters used when adding a new domain
36 40
 DDNS_PROVIDER="default@freedns.afraid.org"
@@ -193,6 +197,10 @@ function configure_dns {
193 197
     echo 'search localdomain' >> /etc/resolv.conf
194 198
     echo "nameserver $NAMESERVER1" >> /etc/resolv.conf
195 199
     echo "nameserver $NAMESERVER2" >> /etc/resolv.conf
200
+    echo "nameserver $NAMESERVER3" >> /etc/resolv.conf
201
+    echo "nameserver $NAMESERVER4" >> /etc/resolv.conf
202
+    echo "nameserver $NAMESERVER5" >> /etc/resolv.conf
203
+    echo "nameserver $NAMESERVER6" >> /etc/resolv.conf
196 204
 
197 205
     # prevent resolv.conf from changing
198 206
     chattr +i /etc/resolv.conf

+ 1
- 1
src/freedombone-utils-network Ver fichero

@@ -61,7 +61,7 @@ function install_static_network {
61 61
     echo "    address $LOCAL_NETWORK_STATIC_IP_ADDRESS" >> /etc/network/interfaces
62 62
     echo '    netmask 255.255.255.0' >> /etc/network/interfaces
63 63
     echo "    gateway $ROUTER_IP_ADDRESS" >> /etc/network/interfaces
64
-    echo "    dns-nameservers $NAMESERVER1 $NAMESERVER2" >> /etc/network/interfaces
64
+    echo "    dns-nameservers $NAMESERVER1 $NAMESERVER2 $NAMESERVER3 $NAMESERVER4 $NAMESERVER5 $NAMESERVER6" >> /etc/network/interfaces
65 65
     echo '# Example to keep MAC address between reboots' >> /etc/network/interfaces
66 66
     echo '#hwaddress ether DE:AD:BE:EF:CA:FE' >> /etc/network/interfaces
67 67
     echo '' >> /etc/network/interfaces