From 94835bcc975668497b6d59c308a9aca18dac9777 Mon Sep 17 00:00:00 2001 From: ChadBHowell Date: Mon, 18 Jan 2016 23:19:49 -0500 Subject: [PATCH] Move dnsmasq.conf to dnsmasq.d/01-pihole.conf Rename dnsmasq.conf to 01-pihole.conf to prepare for move to /etc/dnsmasq.d/ per the normal way of modding configs on Debian based systems. Also will prevent our conf from getting stomped during upgraded. Todo: fix up the backup section to save from both the old way and the new way. --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 0fef8229..86e94495 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -232,9 +232,9 @@ $SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLo installConfigs(){ $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/dnsmasq.conf/01-pihole.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/01-pihole.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 sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.d/01-pihole.conf } stopServices(){