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

Update basic-install.sh

Browse Source
This commit is contained in:
Adam Warner 2016-01-30 14:55:02 +00:00
parent 3c49aa9d9d
commit b93e46de14
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
automated install/basic-install.sh
View File

@ -287,11 +287,7 @@ installConfigs() {
$SUDO echo -n "::: Installing configs..."
$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
<<<<<<< HEAD
$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf
=======
$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf
>>>>>>> CBH/Bugfix/Formatting
$SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf
$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
$SUDO echo " done."