free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Retire the goog, except as the lastest resort. You know what I'm sayin

This commit is contained in:
Bob Mottram 2017-10-15 10:09:18 +01:00
parent 5ee8053265
commit 0ee2753717
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedombone-app-pihole
View File

@ -135,7 +135,7 @@ function pihole_change_upstream_dns {
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
dialog --backtitle $"Ad Blocker Upstream DNS" \ 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 \ 1 $"Digital Courage" on \
2 $"German Privacy Foundation 1" off \ 2 $"German Privacy Foundation 1" off \
3 $"German Privacy Foundation 2" off \ 3 $"German Privacy Foundation 2" off \
@ -151,7 +151,8 @@ function pihole_change_upstream_dns {
13 $"PowerNS" off \ 13 $"PowerNS" off \
14 $"ValiDOM" off \ 14 $"ValiDOM" off \
15 $"Freie Unzensierte" off \ 15 $"Freie Unzensierte" off \
16 $"Google" off 2> $data 16 $"DNS.Watch" off \
17 $"Google" off 2> $data
sel=$? sel=$?
case $sel in case $sel in
1) exit 1;; 1) exit 1;;
@ -203,7 +204,10 @@ function pihole_change_upstream_dns {
15) PIHOLE_DNS1='85.25.149.144' 15) PIHOLE_DNS1='85.25.149.144'
PIHOLE_DNS2='87.106.37.196' 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' PIHOLE_DNS2='4.4.4.4'
;; ;;
255) exit 1;; 255) exit 1;;

4
src/freedombone-image
View File

@ -87,8 +87,8 @@ NAMESERVER1='213.73.91.35'
NAMESERVER2='85.214.20.141' NAMESERVER2='85.214.20.141'
NAMESERVER3='213.73.91.35' NAMESERVER3='213.73.91.35'
NAMESERVER4='85.214.73.63' NAMESERVER4='85.214.73.63'
NAMESERVER5='8.8.8.8' NAMESERVER5='84.200.69.80'
NAMESERVER6='4.4.4.4' NAMESERVER6='84.200.70.40'
# An optional freedombone configuration file # An optional freedombone configuration file
CONFIG_FILENAME= CONFIG_FILENAME=

4
src/freedombone-image-makefile
View File

@ -64,8 +64,8 @@ NAMESERVER1 ?= '213.73.91.35'
NAMESERVER2 ?= '85.214.20.141' NAMESERVER2 ?= '85.214.20.141'
NAMESERVER3 ?= '213.73.91.35' NAMESERVER3 ?= '213.73.91.35'
NAMESERVER4 ?= '85.214.73.63' NAMESERVER4 ?= '85.214.73.63'
NAMESERVER5 ?= '8.8.8.8' NAMESERVER5 ?= '84.200.69.80'
NAMESERVER6 ?= '4.4.4.4' NAMESERVER6 ?= '84.200.70.40'
# 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

4
src/freedombone-utils-dns
View File

@ -33,8 +33,8 @@ NAMESERVER1='213.73.91.35'
NAMESERVER2='85.214.20.141' NAMESERVER2='85.214.20.141'
NAMESERVER3='213.73.91.35' NAMESERVER3='213.73.91.35'
NAMESERVER4='85.214.73.63' NAMESERVER4='85.214.73.63'
NAMESERVER5='8.8.8.8' NAMESERVER5='84.200.69.80'
NAMESERVER6='4.4.4.4' NAMESERVER6='84.200.70.40'
# 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"