From c6450e60e1f740c2029d55657e572edd050090ab Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 31 Jan 2016 20:58:11 +0000 Subject: [PATCH 1/4] Update version.txt Change version number to 2.5 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 7208c218..95e3ba81 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.4 \ No newline at end of file +2.5 From 9412fe8a0a52ee26f2baace67e63e35c586c0576 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 31 Jan 2016 21:01:13 +0000 Subject: [PATCH 2/4] Delete version.txt @mcat12 said it's not needed anymore. --- version.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 version.txt diff --git a/version.txt b/version.txt deleted file mode 100644 index 95e3ba81..00000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -2.5 From 3fdf588cc971887732534cee53163a4b698e9aa9 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 1 Feb 2016 02:09:11 +0000 Subject: [PATCH 3/4] Costmetic fixes, change DynDNS to OpenDNS --- automated install/basic-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 3992665d..2749648d 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -279,9 +279,9 @@ setStaticIPv4() { } setDNS(){ - DNSChoseCmd=(whiptail --separate-output --radiolist "Select DNS Servers" $r $c 2) - DNSChooseOptions=(Google "Use Google's DNS Servers" on - DynDNS "Use DynDNS's DNS Servers" off) + DNSChoseCmd=(whiptail --separate-output --radiolist "Select Upstream DNS Provider" $r $c 2) + DNSChooseOptions=(Google "" on + OpenDNS "" off) DNSchoices=$("${DNSChoseCmd[@]}" "${DNSChooseOptions[@]}" 2>&1 >/dev/tty) if [[ $? = 0 ]];then case $DNSchoices in @@ -291,7 +291,7 @@ setDNS(){ piholeDNS2="8.8.4.4" ;; DynDNS) - echo "::: Using DynDNS servers." + echo "::: Using OpenDNS servers." piholeDNS1="208.67.222.222" piholeDNS2="208.67.220.220" ;; From 38e73a188a9570436a179b8be4333468f7a1bf67 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 1 Feb 2016 02:11:55 +0000 Subject: [PATCH 4/4] Fix array selection --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 2749648d..5400e683 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -290,7 +290,7 @@ setDNS(){ piholeDNS1="8.8.8.8" piholeDNS2="8.8.4.4" ;; - DynDNS) + OpenDNS) echo "::: Using OpenDNS servers." piholeDNS1="208.67.222.222" piholeDNS2="208.67.220.220"