tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More merge conflict resolution

This commit is contained in:
Dan Schaper 2015-12-06 20:24:58 -08:00
parent d215fa9ade
commit 4027139d9c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
automated install/basic-install.sh
View File

@ -186,8 +186,6 @@ static routers=$IPv4gw
static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
}
<<<<<<< HEAD
=======
setStaticIPv4(){
if grep -q $IPv4addr $dhcpcdFile; then
# address already set, noop
@ -199,7 +197,6 @@ else
fi
}
>>>>>>> b261e046bb6a8a2c7f2301ff6a9d37aa70e898fd
installScripts(){
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
@ -213,10 +210,7 @@ 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
<<<<<<< HEAD
=======
sudo sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
>>>>>>> b261e046bb6a8a2c7f2301ff6a9d37aa70e898fd
}
stopServices(){