Source webpage.sh anyway - in the end I don't think we will be able to get away from this without a dedicated function in the core repo (or copying the code - but I wont do that)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2022-07-12 15:48:12 +01:00
parent 49062e17f1
commit 84a497038d
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173
2 changed files with 9 additions and 3 deletions

View File

@ -303,6 +303,14 @@ setup_FTL_upstream_DNS(){
fi
}
setup_FTL_ProcessDNSSettings(){
# Commit settings to 01-pihole.conf
# shellcheck source=/dev/null
. /opt/pihole/webpage.sh
ProcessDNSSettings
}
setup_lighttpd_bind() {
local serverip="${FTLCONF_REPLY_ADDR4}"
# if using '--net=host' only bind lighttpd on $FTLCONF_REPLY_ADDR6 and localhost

View File

@ -44,9 +44,7 @@ setup_FTL_server || true
[ -n "${DNS_FQDN_REQUIRED}" ] && change_setting "DNS_FQDN_REQUIRED" "$DNS_FQDN_REQUIRED"
[ -n "${DNSSEC}" ] && change_setting "DNSSEC" "$DNSSEC"
[ -n "${DNS_BOGUS_PRIV}" ] && change_setting "DNS_BOGUS_PRIV" "$DNS_BOGUS_PRIV"
# We call the following function directly as it also allows us to run ProcessDNSSettings
# (to commit settings to 01-pihole.conf) without sourcing webpage.sh
# pihole -a -i "$DNSMASQ_LISTENING"
setup_FTL_ProcessDNSSettings
# Web interface setup
# ===========================