Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 15:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/patch-1'

Browse source 
Conflicts:
	gravity.sh
This commit is contained in:
Mel 2015-11-11 12:01:09 -06:00
commit db55b04bf6
2 changed files with 64 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
automated install/basic-install.sh
View file

@ -24,70 +24,80 @@ echo " Press Enter when ready "
echo " " echo " "
read read
#Checks if the script is being run as root and sets sudo accordingly
echo "Checking if running as root..."
if (( $EUID==0 )); then SUDO=''
echo "WE ARE ROOT!"
elif [ $(dpkg-query -s -f='${Status}' sudo 2>/dev/null | grep -c "ok installed") -eq 1 ]; then SUDO='sudo'
echo "sudo IS installed... setting SUDO to sudo!"
else echo "Sudo NOT found AND not ROOT! Must run script as root!"
exit 1
fi
if [[ -f /etc/dnsmasq.d/adList.conf ]];then if [[ -f /etc/dnsmasq.d/adList.conf ]];then
echo "Original Pi-hole detected. Initiating sub space transport..." echo "Original Pi-hole detected. Initiating sub space transport..."
sudo mkdir -p /etc/pihole/original/ $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.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/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/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 /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 /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") $SUDO mv /usr/local/bin/gravity.sh /etc/pihole/original/gravity.sh.$(date "+%Y-%m-%d")
else else
: :
fi fi
echo "Updating the Pi..." echo "Updating the Pi..."
sudo apt-get update $SUDO apt-get update
sudo apt-get -y upgrade $SUDO apt-get -y upgrade
echo "Installing tools..." echo "Installing tools..."
sudo apt-get -y install dnsutils $SUDO apt-get -y install dnsutils
sudo apt-get -y install bc $SUDO apt-get -y install bc
sudo apt-get -y install toilet $SUDO apt-get -y install toilet
echo "Installing DNS..." echo "Installing DNS..."
sudo apt-get -y install dnsmasq $SUDO apt-get -y install dnsmasq
sudo update-rc.d dnsmasq enable $SUDO update-rc.d dnsmasq enable
echo "Installing a Web server" echo "Installing a Web server"
sudo apt-get -y install lighttpd php5-common php5-cgi php5 $SUDO apt-get -y install lighttpd php5-common php5-cgi php5
sudo mkdir /var/www/html $SUDO mkdir /var/www/html
sudo chown www-data:www-data /var/www/html $SUDO chown www-data:www-data /var/www/html
sudo chmod 775 /var/www/html $SUDO chmod 775 /var/www/html
sudo usermod -a -G www-data pi $SUDO usermod -a -G www-data pi
echo "Stopping services to modify them..." echo "Stopping services to modify them..."
sudo service dnsmasq stop $SUDO service dnsmasq stop
sudo service lighttpd stop $SUDO service lighttpd stop
echo "Backing up original config files and downloading Pi-hole ones..." echo "Backing up original config files and downloading Pi-hole ones..."
sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig $SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig $SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig $SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
sudo curl -o /etc/dnsmasq.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf" $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 curl -o /etc/lighttpd/lighttpd.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf"
sudo lighty-enable-mod fastcgi fastcgi-php $SUDO lighty-enable-mod fastcgi fastcgi-php
sudo mkdir /var/www/html/pihole $SUDO mkdir /var/www/html/pihole
sudo curl -o /var/www/html/pihole/index.html "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html" $SUDO curl -o /var/www/html/pihole/index.html "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html"
echo "Installing the Web interface..." echo "Installing the Web interface..."
sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip $SUDO wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip
sudo unzip /var/www/master.zip -d /var/www/html/ $SUDO unzip /var/www/master.zip -d /var/www/html/
sudo mv /var/www/html/AdminLTE-master /var/www/html/admin $SUDO mv /var/www/html/AdminLTE-master /var/www/html/admin
sudo rm /var/www/master.zip 2>/dev/null $SUDO rm /var/www/master.zip 2>/dev/null
sudo touch /var/log/pihole.log $SUDO touch /var/log/pihole.log
sudo chmod 644 /var/log/pihole.log $SUDO chmod 644 /var/log/pihole.log
sudo chown dnsmasq:root /var/log/pihole.log $SUDO chown dnsmasq:root /var/log/pihole.log
echo "Locating the Pi-hole..." echo "Locating the Pi-hole..."
sudo curl -o /usr/local/bin/gravity.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.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/chronometer.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh"
sudo chmod 755 /usr/local/bin/gravity.sh $SUDO chmod 755 /usr/local/bin/gravity.sh
sudo chmod 755 /usr/local/bin/chronometer.sh $SUDO chmod 755 /usr/local/bin/chronometer.sh
echo "Entering the event horizon..." echo "Entering the event horizon..."
sudo /usr/local/bin/gravity.sh $SUDO /usr/local/bin/gravity.sh
echo "Restarting..." echo "Restarting..."
sudo reboot $SUDO reboot

14
gravity.sh
View file

@ -5,6 +5,16 @@
# This script should only be run after you have a static IP address set on the Pi # This script should only be run after you have a static IP address set on the Pi
piholeIP=$(hostname -I) piholeIP=$(hostname -I)
#Checks if the script is being run as root and sets sudo accordingly
echo "Checking if running as root..."
if (( $EUID==0 )); then SUDO=''
echo "WE ARE ROOT!"
elif [ $(dpkg-query -s -f='${Status}' sudo 2>/dev/null | grep -c "ok installed") -eq 1 ]; then SUDO='sudo'
echo "sudo IS installed... setting SUDO to sudo!"
else echo "Sudo NOT found AND not ROOT! Must run script as root!"
exit 1
fi
# Ad-list sources--one per line in single quotes # Ad-list sources--one per line in single quotes
sources=('https://adaway.org/hosts.txt' sources=('https://adaway.org/hosts.txt'
'http://adblock.gjtech.net/?format=unix-hosts' 'http://adblock.gjtech.net/?format=unix-hosts'
@ -42,7 +52,7 @@ if [[ -d $piholeDir ]];then
: :
else else
echo "** Creating pihole directory..." echo "** Creating pihole directory..."
sudo mkdir $piholeDir $SUDO mkdir $piholeDir
fi fi
# Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines # Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
@ -132,7 +142,7 @@ function gravity_advanced() {
awk '{print "'"$piholeIP"'" $1}' $origin/$eventHorizon > $origin/$accretionDisc awk '{print "'"$piholeIP"'" $1}' $origin/$eventHorizon > $origin/$accretionDisc
# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
sudo cp $origin/$accretionDisc $adList $SUDO cp $origin/$accretionDisc $adList
kill -HUP $(pidof dnsmasq) kill -HUP $(pidof dnsmasq)
} }