From ead20fe57b7422d5aa80a4bc69e6f5e098abcd92 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 2 Apr 2018 11:54:04 +0100 Subject: [PATCH] Add another dns option --- src/freedombone-app-pihole | 90 +++++++++++++++++---------------- src/freedombone-app-vpn | 4 +- src/freedombone-image | 4 +- src/freedombone-image-customise | 4 +- src/freedombone-image-makefile | 4 +- src/freedombone-utils-dns | 4 +- 6 files changed, 57 insertions(+), 53 deletions(-) diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole index 73d1fdbc..30ca41fc 100755 --- a/src/freedombone-app-pihole +++ b/src/freedombone-app-pihole @@ -37,8 +37,8 @@ IN_DEFAULT_INSTALL=0 SHOW_ON_ABOUT=0 PIHOLE_IFACE=eth0 -PIHOLE_DNS1='85.214.73.63' -PIHOLE_DNS2='213.73.91.35' +PIHOLE_DNS1='91.239.100.100' +PIHOLE_DNS2='89.233.43.71' piholeBasename=pihole piholeDir=/etc/$piholeBasename @@ -134,26 +134,27 @@ function pihole_update { function pihole_change_upstream_dns { data=$(mktemp 2>/dev/null) dialog --backtitle $"Ad Blocker Upstream DNS" \ - --radiolist $"Pick a domain name service (DNS):" 28 50 19 \ - 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 $"DNS.Watch" off \ - 17 $"uncensoreddns.org" off \ - 18 $"Lorraine Data Network" off \ - 19 $"Google" off 2> "$data" + --radiolist $"Pick a domain name service (DNS):" 29 50 20 \ + 1 $"UncensoredDNS" on \ + 2 $"Digital Courage" off \ + 3 $"German Privacy Foundation 1" off \ + 4 $"German Privacy Foundation 2" off \ + 5 $"Chaos Computer Club" off \ + 6 $"ClaraNet" off \ + 7 $"OpenNIC 1" off \ + 8 $"OpenNIC 2" off \ + 9 $"OpenNIC 3" off \ + 10 $"OpenNIC 4" off \ + 11 $"OpenNIC 5" off \ + 12 $"OpenNIC 6" off \ + 13 $"OpenNIC 7" off \ + 14 $"PowerNS" off \ + 15 $"ValiDOM" off \ + 16 $"Freie Unzensierte" off \ + 17 $"DNS.Watch" off \ + 18 $"uncensoreddns.org" off \ + 19 $"Lorraine Data Network" off \ + 20 $"Google" off 2> "$data" sel=$? case $sel in 1) rm -f "$data" @@ -162,61 +163,64 @@ function pihole_change_upstream_dns { exit 1;; esac case $(cat "$data") in - 1) PIHOLE_DNS1='85.214.73.63' + 1) PIHOLE_DNS1='91.239.100.100' + PIHOLE_DNS2='89.233.43.71' + ;; + 2) PIHOLE_DNS1='85.214.73.63' PIHOLE_DNS2='213.73.91.35' ;; - 2) PIHOLE_DNS1='87.118.100.175' + 3) PIHOLE_DNS1='87.118.100.175' PIHOLE_DNS2='94.75.228.29' ;; - 3) PIHOLE_DNS1='85.25.251.254' + 4) PIHOLE_DNS1='85.25.251.254' PIHOLE_DNS2='2.141.58.13' ;; - 4) PIHOLE_DNS1='213.73.91.35' + 5) PIHOLE_DNS1='213.73.91.35' PIHOLE_DNS2='85.214.73.63' ;; - 5) PIHOLE_DNS1='212.82.225.7' + 6) PIHOLE_DNS1='212.82.225.7' PIHOLE_DNS2='212.82.226.212' ;; - 6) PIHOLE_DNS1='58.6.115.42' + 7) PIHOLE_DNS1='58.6.115.42' PIHOLE_DNS2='58.6.115.43' ;; - 7) PIHOLE_DNS1='119.31.230.42' + 8) PIHOLE_DNS1='119.31.230.42' PIHOLE_DNS2='200.252.98.162' ;; - 8) PIHOLE_DNS1='217.79.186.148' + 9) PIHOLE_DNS1='217.79.186.148' PIHOLE_DNS2='81.89.98.6' ;; - 9) PIHOLE_DNS1='78.159.101.37' - PIHOLE_DNS2='203.167.220.153' - ;; - 10) PIHOLE_DNS1='82.229.244.191' + 10) PIHOLE_DNS1='78.159.101.37' + PIHOLE_DNS2='203.167.220.153' + ;; + 11) PIHOLE_DNS1='82.229.244.191' PIHOLE_DNS2='82.229.244.191' ;; - 11) PIHOLE_DNS1='216.87.84.211' + 12) PIHOLE_DNS1='216.87.84.211' PIHOLE_DNS2='66.244.95.20' ;; - 12) PIHOLE_DNS1='207.192.69.155' + 13) PIHOLE_DNS1='207.192.69.155' PIHOLE_DNS2='72.14.189.120' ;; - 13) PIHOLE_DNS1='194.145.226.26' + 14) PIHOLE_DNS1='194.145.226.26' PIHOLE_DNS2='77.220.232.44' ;; - 14) PIHOLE_DNS1='78.46.89.147' + 15) PIHOLE_DNS1='78.46.89.147' PIHOLE_DNS2='88.198.75.145' ;; - 15) PIHOLE_DNS1='85.25.149.144' + 16) PIHOLE_DNS1='85.25.149.144' PIHOLE_DNS2='87.106.37.196' ;; - 16) PIHOLE_DNS1='84.200.69.80' + 17) PIHOLE_DNS1='84.200.69.80' PIHOLE_DNS2='84.200.70.40' ;; - 17) PIHOLE_DNS1='91.239.100.100' + 18) PIHOLE_DNS1='91.239.100.100' PIHOLE_DNS2='89.233.43.71' ;; - 18) PIHOLE_DNS1='80.67.188.188' + 19) PIHOLE_DNS1='80.67.188.188' PIHOLE_DNS2='89.234.141.66' ;; - 19) PIHOLE_DNS1='8.8.8.8' + 20) PIHOLE_DNS1='8.8.8.8' PIHOLE_DNS2='4.4.4.4' dialog --title $"WARNING" \ --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 diff --git a/src/freedombone-app-vpn b/src/freedombone-app-vpn index df241b02..894443f5 100755 --- a/src/freedombone-app-vpn +++ b/src/freedombone-app-vpn @@ -688,8 +688,8 @@ function install_vpn { echo 'dh /etc/openvpn/dh2048.pem'; echo 'server 10.8.0.0 255.255.255.0'; echo 'push "redirect-gateway def1 bypass-dhcp"'; - echo "push \"dhcp-option DNS 85.214.73.63\""; - echo "push \"dhcp-option DNS 213.73.91.35\""; + echo "push \"dhcp-option DNS 91.239.100.100\""; + echo "push \"dhcp-option DNS 89.233.43.71\""; echo 'keepalive 5 30'; echo 'comp-lzo'; echo 'persist-key'; diff --git a/src/freedombone-image b/src/freedombone-image index 14772c86..db127ead 100755 --- a/src/freedombone-image +++ b/src/freedombone-image @@ -83,8 +83,8 @@ ROUTER_IP_ADDRESS="192.168.1.254" BOX_IP_ADDRESS="192.168.1.55" # DNS -NAMESERVER1='213.73.91.35' -NAMESERVER2='85.214.20.141' +NAMESERVER1='91.239.100.100' +NAMESERVER2='89.233.43.71' NAMESERVER3='213.73.91.35' NAMESERVER4='85.214.73.63' NAMESERVER5='84.200.69.80' diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 388161a3..acd15dba 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -62,8 +62,8 @@ ROUTER_IP_ADDRESS="192.168.1.254" BOX_IP_ADDRESS="192.168.1.55" # DNS -NAMESERVER1='85.214.73.63' -NAMESERVER2='213.73.91.35' +NAMESERVER1='91.239.100.100' +NAMESERVER2='89.233.43.71' NAMESERVER3='87.118.100.175' NAMESERVER4='94.75.228.29' NAMESERVER5='85.25.251.254' diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile index 84e71793..052ec809 100755 --- a/src/freedombone-image-makefile +++ b/src/freedombone-image-makefile @@ -60,8 +60,8 @@ ROUTER_IP_ADDRESS ?= "192.168.1.254" BOX_IP_ADDRESS ?= "192.168.1.55" # DNS -NAMESERVER1 ?= '213.73.91.35' -NAMESERVER2 ?= '85.214.20.141' +NAMESERVER1 ?= '91.239.100.100' +NAMESERVER2 ?= '89.233.43.71' NAMESERVER3 ?= '213.73.91.35' NAMESERVER4 ?= '85.214.73.63' NAMESERVER5 ?= '84.200.69.80' diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns index 1a692a73..51b6148a 100755 --- a/src/freedombone-utils-dns +++ b/src/freedombone-utils-dns @@ -29,8 +29,8 @@ # along with this program. If not, see . # DNS -NAMESERVER1='85.214.73.63' -NAMESERVER2='213.73.91.35' +NAMESERVER1='91.239.100.100' +NAMESERVER2='89.233.43.71' NAMESERVER3='87.118.100.175' NAMESERVER4='94.75.228.29' NAMESERVER5='85.25.251.254'