unbound: Update forwarders when system connects/disconnects

[people/pmueller/ipfire-2.x.git] / src / initscripts / system / unbound

diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 138b9623565a047de577309909ebad0135663c1c..a5c56d55870e9df549432dbc83cb55caf16bfa7b 100644 (file)
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -18,12 +18,6 @@ LOCAL_TTL=60
 # Load configuration
 eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
 
-DIG_ARGS=()
-
-if [ "${PROTO}" = "TCP" ]; then
-       DIG_ARGS+=( "+tcp" )
-fi
-
 ip_address_revptr() {
        local addr=${1}
 
@@ -34,10 +28,27 @@ ip_address_revptr() {
 }
 
 read_name_servers() {
-       local i
-       for i in 1 2; do
-               echo "$(</var/ipfire/red/dns${i})"
-       done 2>/dev/null | xargs echo
+       # Read name servers from ISP
+       if [ "${USE_ISP_NAMESERVERS}" = "on" -a "${PROTO}" != "TLS" ]; then
+               local i
+               for i in 1 2; do
+                       echo "$(</var/run/dns${i})"
+               done 2>/dev/null
+       fi
+
+       # Read configured name servers
+       local id address tls_hostname enabled remark
+       while IFS="," read -r id address tls_hostname enabled remark; do
+               [ "${enabled}" != "enabled" ] && continue
+
+               if [ "${PROTO}" = "TLS" ]; then
+                       if [ -n "${tls_hostname}" ]; then
+                               echo "${address}@853#${tls_hostname}"
+                       fi
+               else
+                       echo "${address}"
+               fi
+       done < /var/ipfire/dns/servers
 }
 
 check_red_has_carrier_and_ip() {
@@ -172,20 +183,10 @@ write_forward_conf() {
                fi
 
                # Add upstream name servers
-               local id address tls_hostname enabled remark
-               while IFS="," read -r id address tls_hostname enabled remark; do
-                       # Skip disabled servers
-                       [ "${enabled}" != "enabled" ] && continue
-
-                       # Set DNS server
-                       if [ "${PROTO}" = "TLS" ]; then
-                               if [ -n "${tls_hostname}" ]; then
-                                       echo "  forward-addr: ${address}@853#${tls_hostname}"
-                               fi
-                       else
-                               echo "  forward-addr: ${address}"
-                       fi
-               done < /var/ipfire/dns/servers
+               local ns
+               for ns in $(read_name_servers); do
+                       echo "  forward-addr: ${ns}"
+               done
        ) > /etc/unbound/forward.conf
 }
 
@@ -290,22 +291,26 @@ fix_time_if_dns_fail() {
 resolve() {
        local hostname="${1}"
 
-       local found=0
-       local ns
-       for ns in $(read_name_servers); do
-               local answer
-               for answer in $(dig "${DIG_ARGS[@]}" +short "@${ns}" A "${hostname}"); do
-                       found=1
+       local answer
+       for answer in $(dig +short A "${hostname}"); do
+               # Filter out non-IP addresses
+               if [[ ! "${answer}" =~ \.$ ]]; then
+                       echo "${answer}"
+               fi
+       done
+}
 
-                       # Filter out non-IP addresses
-                       if [[ ! "${answer}" =~ \.$ ]]; then
-                               echo "${answer}"
-                       fi
-               done
+update_forwarders() {
+       # DO nothing when we do not use the ISP name servers
+       [ "${USE_ISP_NAMESERVERS}" != "on" ] && return 0
 
-               # End loop when we have got something
-               [ ${found} -eq 1 ] && break
-       done
+       # Update unbound about the new servers
+       local nameservers=( $(read_name_servers) )
+       if [ -n "${nameservers[*]}" ]; then
+               unbound-control -q forward "${nameservers[@]}"
+       else
+               unbound-control -q forward off
+       fi
 }
 
 # Sets up Safe Search for various search engines
@@ -608,11 +613,14 @@ case "$1" in
                ;;
 
        update-forwarders)
-               : # XXX must set ISP name servers if necessary
+               update_forwarders
+
+               # Update Safe Search settings
+               update_safe_search
                ;;
 
        remove-forwarders)
-               : # XXX must remove ISP name servers
+               update_forwarders
                ;;
 
        resolve)