Cherry picking 3f049fa79, conflict fix

This commit is contained in:
Adam Warner 2016-11-02 09:35:48 +00:00 committed by Dan Schaper
parent 3df2ef8587
commit f36e4ba336

34
pihole
View file

@ -126,24 +126,24 @@ piholeEnable() {
} }
piholeLogging() { piholeLogging() {
shift
shift if [[ "${1}" == "off" ]] ; then
#Disable Logging
if [[ "${1}" == "off" ]] ; then sed -i 's/^log-queries/#log-queries/' /etc/dnsmasq.d/01-pihole.conf
#Disable Logging sed -i 's/^QUERY_LOGGING=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf
sed -i 's/^log-queries/#log-queries/' /etc/dnsmasq.d/01-pihole.conf pihole -f
sed -i 's/^QUERY_LOGGING=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf echo "::: Logging has been disabled!"
echo "::: Logging has been disabled!" elif [[ "${1}" == "on" ]] ; then
elif [[ "${1}" == "on" ]] ; then #Enable logging
#Enable logging sed -i 's/^#log-queries/log-queries/' /etc/dnsmasq.d/01-pihole.conf
sed -i 's/^#log-queries/log-queries/' /etc/dnsmasq.d/01-pihole.conf sed -i 's/^QUERY_LOGGING=false/QUERY_LOGGING=true/' /etc/pihole/setupVars.conf
sed -i 's/^QUERY_LOGGING=false/QUERY_LOGGING=true/' /etc/pihole/setupVars.conf echo "::: Logging has been enabled!"
echo "::: Logging has been enabled!" else
else echo "::: Invalid option passed, please pass 'on' or 'off'"
echo "::: Invalid option passed, please pass 'on' or 'off'" exit 1
exit 1 fi
fi restartDNS
restartDNS
} }
piholeStatus() { piholeStatus() {