Global variables CAP'ed

This commit is contained in:
Dan Schaper 2016-10-31 16:49:40 -07:00
parent 68f7ec0ddc
commit b22d03b586

View file

@ -511,11 +511,11 @@ setLogging() {
case ${LogChoices} in case ${LogChoices} in
"On (Recommended)") "On (Recommended)")
echo "::: Logging On." echo "::: Logging On."
queryLogging=true QUERYLOGGING=true
;; ;;
Off) Off)
echo "::: Logging Off." echo "::: Logging Off."
queryLogging=false QUERYLOGGING=false
;; ;;
esac esac
else else
@ -601,7 +601,7 @@ version_check_dnsmasq() {
sed -i 's/^#conf-dir=\/etc\/dnsmasq.d$/conf-dir=\/etc\/dnsmasq.d/' ${dnsmasq_conf} sed -i 's/^#conf-dir=\/etc\/dnsmasq.d$/conf-dir=\/etc\/dnsmasq.d/' ${dnsmasq_conf}
if [[ "${queryLogging}" == false ]] ; then if [[ "${QUERYLOGGING}" == false ]] ; then
#Disable Logging #Disable Logging
sed -i 's/^log-queries/#log-queries/' ${dnsmasq_pihole_01_location} sed -i 's/^log-queries/#log-queries/' ${dnsmasq_pihole_01_location}
else else
@ -870,7 +870,7 @@ finalExports() {
echo "IPv6_address=${IPv6_address}" echo "IPv6_address=${IPv6_address}"
echo "piholeDNS1=${piholeDNS1}" echo "piholeDNS1=${piholeDNS1}"
echo "piholeDNS2=${piholeDNS2}" echo "piholeDNS2=${piholeDNS2}"
echo "queryLogging=${queryLogging}" echo "queryLogging=${QUERYLOGGING}"
}>> "${setupVars}" }>> "${setupVars}"
} }