From 6663ced38d1c4affbad8dfb97605a10309581109 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 23 Jan 2016 00:13:16 +0000 Subject: [PATCH] Initial commit --- automated install/basic-install.sh | 586 ++++++++++++++--------------- 1 file changed, 293 insertions(+), 293 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 7e527b89..2aa36432 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -16,26 +16,31 @@ # # curl -L install.pi-hole.net | bash -######## VARIABLES ######### +######## FIRST CHECK ######## # Must be root to install if [[ $EUID -eq 0 ]];then echo "You are root." else echo "::: sudo will be used for the install." - # Check if it is actually installed - # If it isn't, exit because the install cannot complete - if [[ $(dpkg-query -s sudo) ]];then + # Check if it is actually installed + # If it isn't, exit because the install cannot complete + if [[ $(dpkg-query -s sudo) ]];then export SUDO="sudo" - else + else echo "::: Please install sudo or run this as root." - exit 1 - fi + exit 1 + fi fi - - +######## VARIABLES ######### tmpLog=/tmp/pihole-install.log instalLogLoc=/etc/pihole/install.log +WEB_INTERFACE_GIT_URL="https://github.com/jacobsalmela/AdminLTE.git" +WEB_INTERFACE_DIR="/var/www/html/admin" +PIHOLE_GIT_URL="https://github.com/jacobsalmela/AdminLTE.git" +PIHOLE_FILES_DIR="/var/www/html/admin" + + # Find the rows and columns rows=$(tput lines) columns=$(tput cols) @@ -54,343 +59,339 @@ dhcpcdFile=/etc/dhcpcd.conf ####### FUNCTIONS ########## ###All credit for the below function goes to http://fitnr.com/showing-a-bash-spinner.html -spinner() -{ - local pid=$1 - local delay=0.001 - local spinstr='|/-\' - while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do - local temp=${spinstr#?} - printf " [%c] " "$spinstr" - local spinstr=$temp${spinstr%"$temp"} - sleep $delay - printf "\b\b\b\b\b\b" - done - printf " \b\b\b\b" +spinner(){ + local pid=$1 + local delay=0.001 + local spinstr='/-\|' + while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do + local temp=${spinstr#?} + printf " [%c] " "$spinstr" + local spinstr=$temp${spinstr%"$temp"} + sleep $delay + printf "\b\b\b\b\b\b" + done + printf " \b\b\b\b" } -backupLegacyPihole() -{ -if [[ -f /etc/dnsmasq.d/adList.conf ]];then - echo "Original Pi-hole detected. Initiating sub space transport" - $SUDO mkdir -p /etc/pihole/original/ - $SUDO mv /etc/dnsmasq.d/adList.conf /etc/pihole/original/adList.conf.$(date "+%Y-%m-%d") - $SUDO mv /etc/dnsmasq.conf /etc/pihole/original/dnsmasq.conf.$(date "+%Y-%m-%d") - $SUDO mv /etc/resolv.conf /etc/pihole/original/resolv.conf.$(date "+%Y-%m-%d") - $SUDO mv /etc/lighttpd/lighttpd.conf /etc/pihole/original/lighttpd.conf.$(date "+%Y-%m-%d") - $SUDO mv /var/www/pihole/index.html /etc/pihole/original/index.html.$(date "+%Y-%m-%d") - $SUDO mv /usr/local/bin/gravity.sh /etc/pihole/original/gravity.sh.$(date "+%Y-%m-%d") -else - : -fi +backupLegacyPihole(){ + if [[ -f /etc/dnsmasq.d/adList.conf ]];then + echo "Original Pi-hole detected. Initiating sub space transport" + $SUDO mkdir -p /etc/pihole/original/ + $SUDO mv /etc/dnsmasq.d/adList.conf /etc/pihole/original/adList.conf.$(date "+%Y-%m-%d") + $SUDO mv /etc/dnsmasq.conf /etc/pihole/original/dnsmasq.conf.$(date "+%Y-%m-%d") + $SUDO mv /etc/resolv.conf /etc/pihole/original/resolv.conf.$(date "+%Y-%m-%d") + $SUDO mv /etc/lighttpd/lighttpd.conf /etc/pihole/original/lighttpd.conf.$(date "+%Y-%m-%d") + $SUDO mv /var/www/pihole/index.html /etc/pihole/original/index.html.$(date "+%Y-%m-%d") + $SUDO mv /usr/local/bin/gravity.sh /etc/pihole/original/gravity.sh.$(date "+%Y-%m-%d") + else + : + fi } -welcomeDialogs() -{ -# Display the welcome dialog -whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "This installer will transform your Raspberry Pi into a network-wide ad blocker!" $r $c - -# Support for a part-time dev -whiptail --msgbox --backtitle "Plea" --title "Free and open source" "The Pi-hole is free, but powered by your donations: http://pi-hole.net/donate" $r $c - -# Explain the need for a static address -whiptail --msgbox --backtitle "Initating network interface" --title "Static IP Needed" "The Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly. - -In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c -} - -chooseInterface() -{ -# Turn the available interfaces into an array so it can be used with a whiptail dialog -interfacesArray=() -firstloop=1 - -while read -r line -do -mode="OFF" -if [[ $firstloop -eq 1 ]]; then - firstloop=0 - mode="ON" -fi -interfacesArray+=("$line" "available" "$mode") -done <<< "$availableInterfaces" - -# Find out how many interfaces are available to choose from -interfaceCount=$(echo "$availableInterfaces" | wc -l) -chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface" $r $c $interfaceCount) -chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty) -for desiredInterface in $chooseInterfaceOptions -do - piholeInterface=$desiredInterface - echo "::: Using interface: $piholeInterface" - echo ${piholeInterface} > /tmp/piholeINT -done -} - -use4andor6() -{ -# Let use select IPv4 and/or IPv6 -cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2) -options=(IPv4 "Block ads over IPv4" on - IPv6 "Block ads over IPv6" off) -choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) -for choice in $choices -do - case $choice in - IPv4)useIPv4=true;; - IPv6)useIPv6=true;; - esac -done - if [ $useIPv4 ] && [ ! $useIPv6 ]; then - getStaticIPv4Settings - setStaticIPv4 - echo "::: Using IPv4 on $IPv4addr" - echo "::: IPv6 will NOT be used." - fi - if [ ! $useIPv4 ] && [ $useIPv6 ]; then - useIPv6dialog - echo "::: IPv4 will NOT be used." - echo "::: Using IPv6 on $piholeIPv6" - fi - if [ $useIPv4 ] && [ $useIPv6 ]; then - getStaticIPv4Settings - setStaticIPv4 - useIPv6dialog - echo "::: Using IPv4 on $IPv4addr" - echo "::: Using IPv6 on $piholeIPv6" - fi - if [ ! $useIPv4 ] && [ ! $useIPv6 ]; then - echo "::: Cannot continue, neither IPv4 or IPv6 selected" - echo "::: Exiting" - exit 1 - fi +welcomeDialogs(){ + # Display the welcome dialog + whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "This installer will transform your Raspberry Pi into a network-wide ad blocker!" $r $c + # Support for a part-time dev + whiptail --msgbox --backtitle "Plea" --title "Free and open source" "The Pi-hole is free, but powered by your donations: http://pi-hole.net/donate" $r $c + + # Explain the need for a static address + whiptail --msgbox --backtitle "Initating network interface" --title "Static IP Needed" "The Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly. + In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c } -useIPv6dialog() -{ -piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }') -whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c -$SUDO mkdir -p /etc/pihole/ -$SUDO touch /etc/pihole/.useIPv6 -} - -getStaticIPv4Settings() -{ -# Ask if the user wants to use DHCP settings as their static IP -if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address? - - IP address: $IPv4addr - Gateway: $IPv4gw" $r $c) then - # If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict. - whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict. But in most cases the router is smart enough to not do that. - - If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want. - - It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." $r $c - # Nothing else to do since the variables are already set above -else - # Otherwise, we need to ask the user to input their desired settings. - # Start by getting the IPv4 address (pre-filling it with info gathered from DHCP) - # Start a loop to let the user enter their information with the chance to go back and edit it if necessary - until [[ $ipSettingsCorrect = True ]] +chooseInterface(){ +# Turn the available interfaces into an array so it can be used with a whiptail dialog + interfacesArray=() + firstloop=1 + + while read -r line do - # Ask for the IPv4 address - IPv4addr=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" $r $c $IPv4addr 3>&1 1>&2 2>&3) - if [[ $? = 0 ]];then - echo "Your static IPv4 address: $IPv4addr" - # Ask for the gateway - IPv4gw=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" $r $c $IPv4gw 3>&1 1>&2 2>&3) + mode="OFF" + if [[ $firstloop -eq 1 ]]; then + firstloop=0 + mode="ON" + fi + interfacesArray+=("$line" "available" "$mode") + done <<< "$availableInterfaces" + + # Find out how many interfaces are available to choose from + interfaceCount=$(echo "$availableInterfaces" | wc -l) + chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface" $r $c $interfaceCount) + chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty) + + for desiredInterface in $chooseInterfaceOptions + do + piholeInterface=$desiredInterface + echo "::: Using interface: $piholeInterface" + echo ${piholeInterface} > /tmp/piholeINT + done +} + +use4andor6(){ + # Let use select IPv4 and/or IPv6 + cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2) + options=(IPv4 "Block ads over IPv4" on + IPv6 "Block ads over IPv6" off) + choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) + for choice in $choices + do + case $choice in + IPv4 ) useIPv4=true;; + IPv6 ) useIPv6=true;; + esac + done + if [ $useIPv4 ] && [ ! $useIPv6 ]; then + getStaticIPv4Settings + setStaticIPv4 + echo "::: Using IPv4 on $IPv4addr" + echo "::: IPv6 will NOT be used." + fi + if [ ! $useIPv4 ] && [ $useIPv6 ]; then + useIPv6dialog + echo "::: IPv4 will NOT be used." + echo "::: Using IPv6 on $piholeIPv6" + fi + if [ $useIPv4 ] && [ $useIPv6 ]; then + getStaticIPv4Settings + setStaticIPv4 + useIPv6dialog + echo "::: Using IPv4 on $IPv4addr" + echo "::: Using IPv6 on $piholeIPv6" + fi + if [ ! $useIPv4 ] && [ ! $useIPv6 ]; then + echo "::: Cannot continue, neither IPv4 or IPv6 selected" + echo "::: Exiting" + exit 1 + fi +} + +useIPv6dialog(){ + piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }') + whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c + $SUDO mkdir -p /etc/pihole/ + $SUDO touch /etc/pihole/.useIPv6 +} + +getStaticIPv4Settings(){ + # Ask if the user wants to use DHCP settings as their static IP + if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address? + IP address: $IPv4addr + Gateway: $IPv4gw" $r $c) then + # If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict. + whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict. But in most cases the router is smart enough to not do that. + If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want. + It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." $r $c + # Nothing else to do since the variables are already set above + else + # Otherwise, we need to ask the user to input their desired settings. + # Start by getting the IPv4 address (pre-filling it with info gathered from DHCP) + # Start a loop to let the user enter their information with the chance to go back and edit it if necessary + until [[ $ipSettingsCorrect = True ]] + do + # Ask for the IPv4 address + IPv4addr=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" $r $c $IPv4addr 3>&1 1>&2 2>&3) if [[ $? = 0 ]];then - echo "Your static IPv4 gateway: $IPv4gw" - # Give the user a chance to review their settings before moving on - if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct? - IP address: $IPv4addr - Gateway: $IPv4gw" $r $c)then - # If the settings are correct, then we need to set the piholeIP - # Saving it to a temporary file us to retrieve it later when we run the gravity.sh script - echo ${IPv4addr%/*} > /tmp/piholeIP - echo $piholeInterface > /tmp/piholeINT - # After that's done, the loop ends and we move on - ipSettingsCorrect=True + echo "Your static IPv4 address: $IPv4addr" + # Ask for the gateway + IPv4gw=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" $r $c $IPv4gw 3>&1 1>&2 2>&3) + if [[ $? = 0 ]];then + echo "Your static IPv4 gateway: $IPv4gw" + # Give the user a chance to review their settings before moving on + if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct? + IP address: $IPv4addr + Gateway: $IPv4gw" $r $c)then + # If the settings are correct, then we need to set the piholeIP + # Saving it to a temporary file us to retrieve it later when we run the gravity.sh script + echo ${IPv4addr%/*} > /tmp/piholeIP + echo $piholeInterface > /tmp/piholeINT + # After that's done, the loop ends and we move on + ipSettingsCorrect=True + else + # If the settings are wrong, the loop continues + ipSettingsCorrect=False + fi else - # If the settings are wrong, the loop continues + # Cancelling gateway settings window ipSettingsCorrect=False + echo "User canceled." + exit fi else - # Cancelling gateway settings window + # Cancelling IPv4 settings window ipSettingsCorrect=False echo "User canceled." exit fi - else - # Cancelling IPv4 settings window - ipSettingsCorrect=False - echo "User canceled." - exit + done + # End the if statement for DHCP vs. static fi -done -# End the if statement for DHCP vs. static -fi } setDHCPCD(){ -# Append these lines to dhcpcd.conf to enable a static IP -echo "interface $piholeInterface -static ip_address=$IPv4addr -static routers=$IPv4gw -static domain_name_servers=$IPv4gw" | $SUDO tee -a $dhcpcdFile >/dev/null + #Append these lines to dhcpcd.conf to enable a static IP + echo "interface $piholeInterface + static ip_address=$IPv4addr + static routers=$IPv4gw + static domain_name_servers=$IPv4gw" | $SUDO tee -a $dhcpcdFile >/dev/null } setStaticIPv4(){ -if grep -q $IPv4addr $dhcpcdFile; then - # address already set, noop - : -else - setDHCPCD - $SUDO ip addr replace dev $piholeInterface $IPv4addr - echo "Setting IP to $IPv4addr. You may need to restart after the install is complete." -fi + if grep -q $IPv4addr $dhcpcdFile; then + # address already set, noop + : + else + setDHCPCD + $SUDO ip addr replace dev $piholeInterface $IPv4addr + echo "Setting IP to $IPv4addr. You may need to restart after the install is complete." + fi } installScripts(){ -$SUDO echo " " -$SUDO echo "::: Installing scripts..." -#$SUDO rm /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh -$SUDO curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh -$SUDO curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh -$SUDO curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh -$SUDO curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/blacklist.sh -$SUDO curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh -$SUDO curl -o /usr/local/bin/updateDashboard.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/updateDashboard.sh -$SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh -$SUDO echo "::: ...done." + $SUDO echo " " + $SUDO echo "::: Installing scripts..." + $SUDO curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh + $SUDO curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh + $SUDO curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh + $SUDO curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/blacklist.sh + $SUDO curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh + $SUDO curl -o /usr/local/bin/updateDashboard.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/updateDashboard.sh + $SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh + $SUDO echo "::: ...done." } installConfigs(){ -$SUDO echo " " -$SUDO echo "::: Installing configs..." -$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig -$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig -$SUDO curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf -$SUDO curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf -$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf -$SUDO echo "::: ...done." + $SUDO echo " " + $SUDO echo "::: Installing configs..." + $SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig + $SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig + $SUDO curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf + $SUDO curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf + $SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf + $SUDO echo "::: ...done." } stopServices(){ -$SUDO echo " " -$SUDO echo "::: Stopping services..." -$SUDO service dnsmasq stop || true -$SUDO service lighttpd stop || true -$SUDO echo "::: ...done." + $SUDO echo " " + $SUDO echo "::: Stopping services..." + $SUDO service dnsmasq stop || true + $SUDO service lighttpd stop || true + $SUDO echo "::: ...done." } installDependencies(){ -$SUDO echo " " -$SUDO echo "::: Updating apt-get package list" -$SUDO apt-get -qq update & spinner $! -$SUDO echo "::: Upgrading apt-get packages" -$SUDO apt-get -yqq upgrade & spinner $! -$SUDO echo "::: ...done." -$SUDO echo "::: installing dnsutils, bc, toilet, and figlet..." -$SUDO apt-get -yqq install dnsutils bc toilet figlet & spinner $! -$SUDO echo "::: ...done." -$SUDO echo "::: Installing dnsmasq..." -$SUDO apt-get -yqq install dnsmasq & spinner $! -$SUDO echo "::: ...done." -$SUDO echo "::: Installing lighttpd, php5-common, php5-cgi, and php5..." -$SUDO apt-get -yqq install lighttpd php5-common php5-cgi php5 & spinner $! -$SUDO echo "::: ...done." -$SUDO echo "::: Installing git..." -$SUDO apt-get -yqq install git & spinner $! -$SUDO echo "::: ...done." + $SUDO echo " " + $SUDO echo "::: Updating apt-get package list" + $SUDO apt-get -qq update & spinner $! + $SUDO echo "::: Upgrading apt-get packages" + $SUDO apt-get -yqq upgrade & spinner $! + $SUDO echo "::: ...done." + $SUDO echo "::: installing dnsutils, bc, toilet, and figlet..." + $SUDO apt-get -yqq install dnsutils bc toilet figlet & spinner $! + $SUDO echo "::: ...done." + $SUDO echo "::: Installing dnsmasq..." + $SUDO apt-get -yqq install dnsmasq & spinner $! + $SUDO echo "::: ...done." + $SUDO echo "::: Installing lighttpd, php5-common, php5-cgi, and php5..." + $SUDO apt-get -yqq install lighttpd php5-common php5-cgi php5 & spinner $! + $SUDO echo "::: ...done." + $SUDO echo "::: Installing git..." + $SUDO apt-get -yqq install git & spinner $! + $SUDO echo "::: ...done." } installWebAdmin(){ -$SUDO echo " " -$SUDO echo "::: Downloading and installing latest WebAdmin files..." -if [ -d "/var/www/html/admin" ]; then - $SUDO rm -rf /var/www/html/admin -fi -if [ -d "/var/www/html/AdminLTE-master" ]; then - $SUDO rm -rf /var/www/html/AdminLTE-master -fi -$SUDO wget -nv https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip & spinner $! -$SUDO unzip -oq /var/www/master.zip -d /var/www/html/ -$SUDO mv /var/www/html/AdminLTE-master /var/www/html/admin -$SUDO rm /var/www/master.zip 2>/dev/null -$SUDO echo "::: ...Done." - -$SUDO echo "::: Creating log file and changing owner to dnsmasq..." -if [ ! -f /var/log/pihole.log ]; then - $SUDO touch /var/log/pihole.log - $SUDO chmod 644 /var/log/pihole.log - $SUDO chown dnsmasq:root /var/log/pihole.log -else - $SUDO echo "::: No need to create, already exists!" -fi -$SUDO echo "::: ...done." - + $SUDO echo " " + $SUDO echo "::: Downloading and installing latest WebAdmin files..." + if [ -d "/var/www/html/admin" ]; then + $SUDO rm -rf /var/www/html/admin + fi + if [ -d "/var/www/html/AdminLTE-master" ]; then + $SUDO rm -rf /var/www/html/AdminLTE-master + fi + $SUDO wget -nv https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip & spinner $! + $SUDO unzip -oq /var/www/master.zip -d /var/www/html/ + $SUDO mv /var/www/html/AdminLTE-master /var/www/html/admin + $SUDO rm /var/www/master.zip 2>/dev/null + $SUDO echo "::: ...Done." + + $SUDO echo "::: Creating log file and changing owner to dnsmasq..." + if [ ! -f /var/log/pihole.log ]; then + $SUDO touch /var/log/pihole.log + $SUDO chmod 644 /var/log/pihole.log + $SUDO chown dnsmasq:root /var/log/pihole.log + else + $SUDO echo "::: No need to create, already exists!" + fi + $SUDO echo "::: ...done." } installPiholeWeb(){ -$SUDO echo " " -$SUDO echo "::: Downloading and installing pihole custom index page..." -if [ -d "/var/www/html/pihole" ]; then - $SUDO echo "::: Existing page detected, not overwriting" -else - $SUDO mkdir /var/www/html/pihole - $SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig - $SUDO curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html -fi -$SUDO echo "::: ...done." + $SUDO echo " " + $SUDO echo "::: Downloading and installing pihole custom index page..." + if [ -d "/var/www/html/pihole" ]; then + $SUDO echo "::: Existing page detected, not overwriting" + else + $SUDO mkdir /var/www/html/pihole + $SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig + $SUDO curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html + fi + $SUDO echo "::: ...done." } installCron(){ -$SUDO echo " " -$SUDO echo "::: Downloading latest Cron script..." -$SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron -$SUDO echo "::: ...done." + $SUDO echo " " + $SUDO echo "::: Downloading latest Cron script..." + $SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron + $SUDO echo "::: ...done." } -runGravity() -{ -$SUDO echo " " -$SUDO echo "::: Preparing to run gravity.sh to refresh hosts..." -if ls /etc/pihole/list* 1> /dev/null 2>&1; then - echo "::: Cleaning up previous install (preserving whitelist/blacklist)" - $SUDO rm /etc/pihole/list.* -fi -#Don't run as SUDO, this was causing issues -/usr/local/bin/gravity.sh -$SUDO echo "::: ...done." +runGravity(){ + $SUDO echo " " + $SUDO echo "::: Preparing to run gravity.sh to refresh hosts..." + if ls /etc/pihole/list* 1> /dev/null 2>&1; then + echo "::: Cleaning up previous install (preserving whitelist/blacklist)" + $SUDO rm /etc/pihole/list.* + fi + #Don't run as SUDO, this was causing issues + /usr/local/bin/gravity.sh + $SUDO echo "::: ...done." +} + +checkForAndInstallDependencies(){ + if [ -d "/var/www/html/admin" ]; then + #Likely an existing install, no need to apt-get update + echo "::: Previous installation detected" + else + echo "::: First time install, updating package list" + $SUDO apt-get -qq update & spinner $! + echo "::: Upgrading installed apt-get packages" + $SUDO apt-get -yqq upgrade & spinner $! + fi } -installPihole() -{ -installDependencies -stopServices -$SUDO chown www-data:www-data /var/www/html -$SUDO chmod 775 /var/www/html -$SUDO usermod -a -G www-data pi -$SUDO lighty-enable-mod fastcgi fastcgi-php -installScripts -installConfigs -installWebAdmin -installPiholeWeb -installCron -runGravity - +installPihole(){ + installDependencies + stopServices + $SUDO chown www-data:www-data /var/www/html + $SUDO chmod 775 /var/www/html + $SUDO usermod -a -G www-data pi + $SUDO lighty-enable-mod fastcgi fastcgi-php + installScripts + installConfigs + installWebAdmin + installPiholeWeb + installCron + runGravity } displayFinalMessage(){ - whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using: +whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using: - $IPv4addr - $piholeIPv6 +$IPv4addr +$piholeIPv6 If you set a new IP address, you should restart the Pi. @@ -403,13 +404,12 @@ welcomeDialogs # Just back up the original Pi-hole right away since it won't take long and it gets it out of the way backupLegacyPihole - # Find interfaces and let the user choose one chooseInterface - # Let the user decide if they want to block ads over IPv4 and/or IPv6 use4andor6 +checkForAndInstallDependencies # Install and log everything to a file installPihole | tee $tmpLog