From 0ee275371735ab3eabf91cad8a9f25634523ab5b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 15 Oct 2017 10:09:18 +0100
Subject: [PATCH] Retire the goog, except as the lastest resort. You know what
I'm sayin
---
src/freedombone-app-pihole | 10 +++++++---
src/freedombone-image | 4 ++--
src/freedombone-image-makefile | 4 ++--
src/freedombone-utils-dns | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole
index 7b9a8c6b1..23f43a802 100755
--- a/src/freedombone-app-pihole
+++ b/src/freedombone-app-pihole
@@ -135,7 +135,7 @@ function pihole_change_upstream_dns {
data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Ad Blocker Upstream DNS" \
- --radiolist $"Pick a domain name service (DNS):" 25 50 16 \
+ --radiolist $"Pick a domain name service (DNS):" 26 50 17 \
1 $"Digital Courage" on \
2 $"German Privacy Foundation 1" off \
3 $"German Privacy Foundation 2" off \
@@ -151,7 +151,8 @@ function pihole_change_upstream_dns {
13 $"PowerNS" off \
14 $"ValiDOM" off \
15 $"Freie Unzensierte" off \
- 16 $"Google" off 2> $data
+ 16 $"DNS.Watch" off \
+ 17 $"Google" off 2> $data
sel=$?
case $sel in
1) exit 1;;
@@ -203,7 +204,10 @@ function pihole_change_upstream_dns {
15) PIHOLE_DNS1='85.25.149.144'
PIHOLE_DNS2='87.106.37.196'
;;
- 16) PIHOLE_DNS1='8.8.8.8'
+ 16) PIHOLE_DNS1='84.200.69.80'
+ PIHOLE_DNS2='84.200.70.40'
+ ;;
+ 17) PIHOLE_DNS1='8.8.8.8'
PIHOLE_DNS2='4.4.4.4'
;;
255) exit 1;;
diff --git a/src/freedombone-image b/src/freedombone-image
index f5b4fc995..17a57ee89 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -87,8 +87,8 @@ NAMESERVER1='213.73.91.35'
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'
+NAMESERVER5='84.200.69.80'
+NAMESERVER6='84.200.70.40'
# An optional freedombone configuration file
CONFIG_FILENAME=
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index a8cbe02b9..59729f4ef 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -64,8 +64,8 @@ NAMESERVER1 ?= '213.73.91.35'
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'
+NAMESERVER5 ?= '84.200.69.80'
+NAMESERVER6 ?= '84.200.70.40'
# Using taskset to pin build process to single core. This is a
# workaround for a qemu-user-static issue that causes builds to
diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns
index 31a30ab70..7c5c5b84c 100755
--- a/src/freedombone-utils-dns
+++ b/src/freedombone-utils-dns
@@ -33,8 +33,8 @@ NAMESERVER1='213.73.91.35'
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'
+NAMESERVER5='84.200.69.80'
+NAMESERVER6='84.200.70.40'
# parameters used when adding a new domain
DDNS_PROVIDER="default@freedns.afraid.org"
--
GitLab