From 49bb6dc0daf107710ce1844c427ea0303fd307ef Mon Sep 17 00:00:00 2001 From: MichaIng Date: Thu, 20 Feb 2025 18:25:35 +0100 Subject: [PATCH] Apply chosen upstream DNS on fresh install While the dialog is shown to choose or enter an upstream DNS for Pi-hole, it is never applied. Hence fresh Pi-hole installs have no upstream DNS and cannot resolve queries. It is now checked for the two generated variables PIHOLE_DNS_1 and PIHOLE_DNS_2, a TOML array generated and applied via pihole-FTL CLI. Signed-off-by: MichaIng --- automated install/basic-install.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index a5c5f3e2..d45b6c00 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2549,9 +2549,14 @@ main() { restart_service pihole-FTL - # write privacy level and logging to pihole.toml + # apply settings to pihole.toml # needs to be done after FTL service has been started, otherwise pihole.toml does not exist - # set on fresh installations by setPrivacyLevel() and setLogging( + # set on fresh installations by setDNS() and setPrivacyLevel() and setLogging() + if [ -n "${PIHOLE_DNS_1}" ]; then + local string="\"${PIHOLE_DNS_1}\"" + [ -n "${PIHOLE_DNS_2}" ] && string+=", \"${PIHOLE_DNS_2}\"" + setFTLConfigValue "dns.upstreams" "[ $string ]" + fi if [ -n "${QUERY_LOGGING}" ]; then setFTLConfigValue "dns.queryLogging" "${QUERY_LOGGING}" fi