Skip to content
Snippets Groups Projects
Commit 7359cdd6 authored by Bob Mottram's avatar Bob Mottram
Browse files

More dns nameservers

parent 7c6db87b
No related branches found
No related tags found
No related merge requests found
...@@ -219,6 +219,26 @@ else ...@@ -219,6 +219,26 @@ else
shift shift
NAMESERVER2=$1 NAMESERVER2=$1
;; ;;
# DNS Nameserver 3
--ns3)
shift
NAMESERVER3=$1
;;
# DNS Nameserver 4
--ns4)
shift
NAMESERVER4=$1
;;
# DNS Nameserver 5
--ns5)
shift
NAMESERVER5=$1
;;
# DNS Nameserver 6
--ns6)
shift
NAMESERVER6=$1
;;
# Debian repository # Debian repository
--repo) --repo)
shift shift
......
...@@ -85,6 +85,10 @@ BOX_IP_ADDRESS="192.168.1.55" ...@@ -85,6 +85,10 @@ BOX_IP_ADDRESS="192.168.1.55"
# DNS # DNS
NAMESERVER1='213.73.91.35' NAMESERVER1='213.73.91.35'
NAMESERVER2='85.214.20.141' NAMESERVER2='85.214.20.141'
NAMESERVER3='213.73.91.35'
NAMESERVER4='85.214.73.63'
NAMESERVER5='8.8.8.8'
NAMESERVER6='4.4.4.4'
# An optional freedombone configuration file # An optional freedombone configuration file
CONFIG_FILENAME= CONFIG_FILENAME=
...@@ -274,6 +278,10 @@ function mesh_router_setup_script { ...@@ -274,6 +278,10 @@ function mesh_router_setup_script {
echo 'DEBIAN_REPO=' >> $mesh_script_filename echo 'DEBIAN_REPO=' >> $mesh_script_filename
echo 'NAMESERVER1=' >> $mesh_script_filename echo 'NAMESERVER1=' >> $mesh_script_filename
echo 'NAMESERVER2=' >> $mesh_script_filename echo 'NAMESERVER2=' >> $mesh_script_filename
echo 'NAMESERVER3=' >> $mesh_script_filename
echo 'NAMESERVER4=' >> $mesh_script_filename
echo 'NAMESERVER5=' >> $mesh_script_filename
echo 'NAMESERVER6=' >> $mesh_script_filename
echo 'BATMAN_CELLID=any' >> $mesh_script_filename echo 'BATMAN_CELLID=any' >> $mesh_script_filename
echo 'WIFI_CHANNEL=9' >> $mesh_script_filename echo 'WIFI_CHANNEL=9' >> $mesh_script_filename
} }
...@@ -340,6 +348,26 @@ do ...@@ -340,6 +348,26 @@ do
shift shift
NAMESERVER2="$1" NAMESERVER2="$1"
;; ;;
# nameserver 3
--ns3|--nameserver3)
shift
NAMESERVER2="$1"
;;
# nameserver 4
--ns4|--nameserver4)
shift
NAMESERVER4="$1"
;;
# nameserver 5
--ns5|--nameserver5)
shift
NAMESERVER5="$1"
;;
# nameserver 6
--ns6|--nameserver6)
shift
NAMESERVER6="$1"
;;
-i|--interactive) -i|--interactive)
shift shift
INTERACTIVE="$1" INTERACTIVE="$1"
...@@ -526,6 +554,10 @@ make $IMAGE_TYPE \ ...@@ -526,6 +554,10 @@ make $IMAGE_TYPE \
BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \ BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
NAMESERVER1="$NAMESERVER1" \ NAMESERVER1="$NAMESERVER1" \
NAMESERVER2="$NAMESERVER2" \ NAMESERVER2="$NAMESERVER2" \
NAMESERVER3="$NAMESERVER3" \
NAMESERVER4="$NAMESERVER4" \
NAMESERVER5="$NAMESERVER5" \
NAMESERVER6="$NAMESERVER6" \
PROJECT_NAME="$PROJECT_NAME" \ PROJECT_NAME="$PROJECT_NAME" \
CONFIG_FILENAME="$CONFIG_FILENAME" \ CONFIG_FILENAME="$CONFIG_FILENAME" \
IMAGE_SIZE="$IMAGE_SIZE" \ IMAGE_SIZE="$IMAGE_SIZE" \
......
...@@ -54,6 +54,10 @@ export ROUTER_IP_ADDRESS ...@@ -54,6 +54,10 @@ export ROUTER_IP_ADDRESS
export BOX_IP_ADDRESS export BOX_IP_ADDRESS
export NAMESERVER1 export NAMESERVER1
export NAMESERVER2 export NAMESERVER2
export NAMESERVER3
export NAMESERVER4
export NAMESERVER5
export NAMESERVER6
export PROJECT_NAME export PROJECT_NAME
export CONFIG_FILENAME export CONFIG_FILENAME
export SSH_PUBKEY export SSH_PUBKEY
...@@ -200,7 +204,11 @@ fi ...@@ -200,7 +204,11 @@ fi
sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE3 sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
sed -i "s|BOX_IP_ADDRESS=.*|BOX_IP_ADDRESS=${BOX_IP_ADDRESS}|g" $TEMP_CUSTOMISE3 sed -i "s|BOX_IP_ADDRESS=.*|BOX_IP_ADDRESS=${BOX_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE3 sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE3
sed -i "s|NAMESERVER2=.*|NAMESERVER2=${NAMESERVER1}|g" $TEMP_CUSTOMISE3 sed -i "s|NAMESERVER2=.*|NAMESERVER2=${NAMESERVER2}|g" $TEMP_CUSTOMISE3
sed -i "s|NAMESERVER3=.*|NAMESERVER3=${NAMESERVER3}|g" $TEMP_CUSTOMISE3
sed -i "s|NAMESERVER4=.*|NAMESERVER4=${NAMESERVER4}|g" $TEMP_CUSTOMISE3
sed -i "s|NAMESERVER5=.*|NAMESERVER5=${NAMESERVER5}|g" $TEMP_CUSTOMISE3
sed -i "s|NAMESERVER6=.*|NAMESERVER6=${NAMESERVER6}|g" $TEMP_CUSTOMISE3
sed -i "s|PROJECT_NAME=.*|PROJECT_NAME=${PROJECT_NAME}|g" $TEMP_CUSTOMISE3 sed -i "s|PROJECT_NAME=.*|PROJECT_NAME=${PROJECT_NAME}|g" $TEMP_CUSTOMISE3
sed -i "s|CONFIG_FILENAME=.*|CONFIG_FILENAME=${CONFIG_FILENAME}|g" $TEMP_CUSTOMISE3 sed -i "s|CONFIG_FILENAME=.*|CONFIG_FILENAME=${CONFIG_FILENAME}|g" $TEMP_CUSTOMISE3
sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE3 sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE3
......
...@@ -62,6 +62,10 @@ BOX_IP_ADDRESS ?= "192.168.1.55" ...@@ -62,6 +62,10 @@ BOX_IP_ADDRESS ?= "192.168.1.55"
# DNS # DNS
NAMESERVER1 ?= '213.73.91.35' NAMESERVER1 ?= '213.73.91.35'
NAMESERVER2 ?= '85.214.20.141' NAMESERVER2 ?= '85.214.20.141'
NAMESERVER3 ?= '213.73.91.35'
NAMESERVER4 ?= '85.214.73.63'
NAMESERVER5 ?= '8.8.8.8'
NAMESERVER6 ?= '4.4.4.4'
# Using taskset to pin build process to single core. This is a # Using taskset to pin build process to single core. This is a
# workaround for a qemu-user-static issue that causes builds to # workaround for a qemu-user-static issue that causes builds to
...@@ -75,6 +79,10 @@ MAKE_IMAGE = ARCHITECTURE=$(ARCHITECTURE) MACHINE=$(MACHINE) SOURCE=$(SOURCE) \ ...@@ -75,6 +79,10 @@ MAKE_IMAGE = ARCHITECTURE=$(ARCHITECTURE) MACHINE=$(MACHINE) SOURCE=$(SOURCE) \
BOX_IP_ADDRESS=$(BOX_IP_ADDRESS) \ BOX_IP_ADDRESS=$(BOX_IP_ADDRESS) \
NAMESERVER1=$(NAMESERVER1) \ NAMESERVER1=$(NAMESERVER1) \
NAMESERVER2=$(NAMESERVER2) \ NAMESERVER2=$(NAMESERVER2) \
NAMESERVER3=$(NAMESERVER3) \
NAMESERVER4=$(NAMESERVER4) \
NAMESERVER5=$(NAMESERVER5) \
NAMESERVER6=$(NAMESERVER6) \
CUSTOM_SETUP=$(CUSTOM_SETUP) \ CUSTOM_SETUP=$(CUSTOM_SETUP) \
IMAGE_SIZE=$(IMAGE_SIZE) taskset 0x01 $(PROJECT_NAME)-image-make $(NAME) IMAGE_SIZE=$(IMAGE_SIZE) taskset 0x01 $(PROJECT_NAME)-image-make $(NAME)
......
...@@ -51,6 +51,10 @@ configuration_variables=(FRIENDS_MIRRORS_SERVER ...@@ -51,6 +51,10 @@ configuration_variables=(FRIENDS_MIRRORS_SERVER
XMPP_DOMAIN_CODE XMPP_DOMAIN_CODE
NAMESERVER1 NAMESERVER1
NAMESERVER2 NAMESERVER2
NAMESERVER3
NAMESERVER4
NAMESERVER5
NAMESERVER6
GET_IP_ADDRESS_URL GET_IP_ADDRESS_URL
DDNS_PROVIDER DDNS_PROVIDER
DDNS_USERNAME DDNS_USERNAME
......
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
# DNS # DNS
NAMESERVER1='213.73.91.35' NAMESERVER1='213.73.91.35'
NAMESERVER2='85.214.20.141' NAMESERVER2='85.214.20.141'
NAMESERVER3='213.73.91.35'
NAMESERVER4='85.214.73.63'
NAMESERVER5='8.8.8.8'
NAMESERVER6='4.4.4.4'
# parameters used when adding a new domain # parameters used when adding a new domain
DDNS_PROVIDER="default@freedns.afraid.org" DDNS_PROVIDER="default@freedns.afraid.org"
...@@ -193,6 +197,10 @@ function configure_dns { ...@@ -193,6 +197,10 @@ function configure_dns {
echo 'search localdomain' >> /etc/resolv.conf echo 'search localdomain' >> /etc/resolv.conf
echo "nameserver $NAMESERVER1" >> /etc/resolv.conf echo "nameserver $NAMESERVER1" >> /etc/resolv.conf
echo "nameserver $NAMESERVER2" >> /etc/resolv.conf echo "nameserver $NAMESERVER2" >> /etc/resolv.conf
echo "nameserver $NAMESERVER3" >> /etc/resolv.conf
echo "nameserver $NAMESERVER4" >> /etc/resolv.conf
echo "nameserver $NAMESERVER5" >> /etc/resolv.conf
echo "nameserver $NAMESERVER6" >> /etc/resolv.conf
# prevent resolv.conf from changing # prevent resolv.conf from changing
chattr +i /etc/resolv.conf chattr +i /etc/resolv.conf
......
...@@ -61,7 +61,7 @@ function install_static_network { ...@@ -61,7 +61,7 @@ function install_static_network {
echo " address $LOCAL_NETWORK_STATIC_IP_ADDRESS" >> /etc/network/interfaces echo " address $LOCAL_NETWORK_STATIC_IP_ADDRESS" >> /etc/network/interfaces
echo ' netmask 255.255.255.0' >> /etc/network/interfaces echo ' netmask 255.255.255.0' >> /etc/network/interfaces
echo " gateway $ROUTER_IP_ADDRESS" >> /etc/network/interfaces echo " gateway $ROUTER_IP_ADDRESS" >> /etc/network/interfaces
echo " dns-nameservers $NAMESERVER1 $NAMESERVER2" >> /etc/network/interfaces echo " dns-nameservers $NAMESERVER1 $NAMESERVER2 $NAMESERVER3 $NAMESERVER4 $NAMESERVER5 $NAMESERVER6" >> /etc/network/interfaces
echo '# Example to keep MAC address between reboots' >> /etc/network/interfaces echo '# Example to keep MAC address between reboots' >> /etc/network/interfaces
echo '#hwaddress ether DE:AD:BE:EF:CA:FE' >> /etc/network/interfaces echo '#hwaddress ether DE:AD:BE:EF:CA:FE' >> /etc/network/interfaces
echo '' >> /etc/network/interfaces echo '' >> /etc/network/interfaces
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment