From 830b287e5ddb6a1e9d5f9d2580432ed556922e0f Mon Sep 17 00:00:00 2001 From: Chad Howell Date: Tue, 23 Feb 2016 00:08:50 -0500 Subject: [PATCH 1/5] Update README.md Add NTC CHIP and Debian based distros --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 207375f2..687cc359 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Automated Install -##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet adapter) +##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), NTC CHIP, and most Debian based distributions -1. Install Raspbian +1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines 2. Run the command below ### ```curl -L install.pi-hole.net | bash``` From c3b5b97a41465808786500acb479ce84461f06b6 Mon Sep 17 00:00:00 2001 From: Chad Howell Date: Thu, 25 Feb 2016 19:42:43 -0500 Subject: [PATCH 2/5] Update README.md Changed wording per @PromoFaux recommendations. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 687cc359..20b581fa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Automated Install -##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), NTC CHIP, and most Debian based distributions +##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter) and (also works on most Debian based distros!) 1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines 2. Run the command below From af839360477becd626eef8f9b5df86e3863f3ca8 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 28 Feb 2016 15:18:48 -0500 Subject: [PATCH 3/5] Added password to install Saves in password.txt --- automated install/basic-install.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index b3e6202f..9c65467c 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -658,6 +658,19 @@ setUser(){ fi } +setPassword() { + # Password needed to authorize changes to lists from admin page + pass = $(whiptail --passwordbox "Please enter a password to secure your Pi-hole web interface." 10 50 3>&1 1>&2 2>&3) + + if [ $? = 0 ]; then + # Entered password + echo pass > /etc/pihole/password.txt + else + echo "::: Cancel selected, exiting...." + exit 1 + fi +} + installPihole() { # Install base files and web interface checkForDependencies # done @@ -708,6 +721,9 @@ use4andor6 # Decide what upstream DNS Servers to use setDNS +# Set the admin page password +setPassword + # Install and log everything to a file installPihole | tee $tmpLog From adcd7f10ee2b43b31a3ec2dd1116e46cb68c3d82 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 28 Feb 2016 15:24:38 -0500 Subject: [PATCH 4/5] Fixed password input --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 9c65467c..883e2c61 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -660,11 +660,11 @@ setUser(){ setPassword() { # Password needed to authorize changes to lists from admin page - pass = $(whiptail --passwordbox "Please enter a password to secure your Pi-hole web interface." 10 50 3>&1 1>&2 2>&3) + pass=$(whiptail --passwordbox "Please enter a password to secure your Pi-hole web interface." 10 50 3>&1 1>&2 2>&3) if [ $? = 0 ]; then # Entered password - echo pass > /etc/pihole/password.txt + echo $pass > /etc/pihole/password.txt else echo "::: Cancel selected, exiting...." exit 1 From b07b77c58f8603a95e0dc090e933c4f194ce7801 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 29 Feb 2016 20:09:49 -0500 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20b581fa..02e7468f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Automated Install -##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter) and (also works on most Debian based distros!) +##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), and also works on most Debian based distros! 1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines 2. Run the command below