Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh

Major simplification of webpage.sh + extend DHCP to IPv6
This commit is contained in:
Adam Warner 2017-01-02 14:28:26 +00:00 committed by GitHub
commit 12bec1df68
3 changed files with 188 additions and 128 deletions

View file

@ -910,6 +910,18 @@ finalExports() {
echo "PIHOLE_DNS_2=${PIHOLE_DNS_2}"
echo "QUERY_LOGGING=${QUERY_LOGGING}"
}>> "${setupVars}"
# Look for DNS server settings which would have to be reapplied
source "${setupVars}"
source "/etc/.pihole/advanced/Scripts/webpage.sh"
if [[ "${DNS_FQDN_REQUIRED}" != "" ]] ; then
ProcessDNSSettings
fi
if [[ "${DHCP_ACTIVE}" != "" ]] ; then
ProcessDHCPSettings
fi
}
installPihole() {