Cherry picking 3f049fa79, conflict fix

pihole

@@ -126,24 +126,24 @@ piholeEnable() {
 }
 
 piholeLogging() {
-
+  shift
-    shift
+
-
+  if [[ "${1}" == "off" ]] ; then
-    if [[ "${1}" == "off" ]] ; then
+    #Disable Logging
-        #Disable 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=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf
-        sed -i 's/^QUERY_LOGGING=true/QUERY_LOGGING=false/' /etc/pihole/setupVars.conf
+    pihole -f
-        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() {