moparisthebest/pi-hole
1
0
Fork 0
mirror of https://github.com/moparisthebest/pi-hole synced 2024-12-22 07:08:49 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into pr/118

Browse Source 
# Conflicts:
#	automated install/basic-install.sh
This commit is contained in:
Jacob Salmela 2015-12-06 16:21:45 -06:00
commit fd9b34ad9b
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
advanced/dnsmasq.conf
View File

@ -26,7 +26,7 @@ server=8.8.4.4
# If you want dnsmasq to listen for DHCP and DNS requests only on # If you want dnsmasq to listen for DHCP and DNS requests only on
# specified interfaces (and the loopback) give the name of the # specified interfaces (and the loopback) give the name of the
# interface (eg eth0) here. # interface (eg eth0) here.
interface=eth0 interface=@INT@
# Or which to listen on by address (remember to include 127.0.0.1 if # Or which to listen on by address (remember to include 127.0.0.1 if
# you use this.) # you use this.)
listen-address=127.0.0.1 listen-address=127.0.0.1
@ -45,3 +45,6 @@ log-facility=/var/log/pihole.log
# server for potentially stale date, you can set a time-to-live (in # server for potentially stale date, you can set a time-to-live (in
# seconds) here. # seconds) here.
local-ttl=300 local-ttl=300
# This allows it to continue functioning without being blocked by syslog, and allows syslog to use dnsmasq for DNS queries without risking deadlock
log-async

26
automated install/basic-install.sh
View File

@ -176,6 +176,11 @@ echo "interface $piholeInterface
static ip_address=$IPv4addr static ip_address=$IPv4addr
static routers=$IPv4gw static routers=$IPv4gw
static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
<<<<<<< HEAD
=======
echo "Setting IP to $IPv4addr. You may need to restart after the install is complete."
sudo ip addr replace dev $piholeInterface $IPv4addr
>>>>>>> master
} }
setStaticIPv4(){ setStaticIPv4(){
@ -216,9 +221,30 @@ sudo apt-get -y upgrade
sudo apt-get -y install dnsutils bc toilet sudo apt-get -y install dnsutils bc toilet
sudo apt-get -y install dnsmasq sudo apt-get -y install dnsmasq
sudo apt-get -y install lighttpd php5-common php5-cgi php5 sudo apt-get -y install lighttpd php5-common php5-cgi php5
<<<<<<< HEAD
} }
installWebAdmin(){ installWebAdmin(){
=======
sudo mkdir /var/www/html
sudo chown www-data:www-data /var/www/html
sudo chmod 775 /var/www/html
sudo usermod -a -G www-data pi
sudo service dnsmasq stop
sudo service lighttpd stop
sudo mv /etc/dnsmasq.conf /etc/dnsmasq.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 /etc/crontab /etc/crontab.orig
sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf
sudo sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf
sudo mv /etc/crontab /etc/crontab.orig
sudo curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
sudo lighty-enable-mod fastcgi fastcgi-php
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
>>>>>>> master
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 -oq /var/www/master.zip -d /var/www/html/ sudo unzip -oq /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