webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-17 06:23:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

unbound: Update forwarders when system connects/disconnects

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2020-01-07 15:21:59 +00:00
parent 54898bc6c1
commit 2654c66945
1 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/initscripts/system/unbound
View File

@@ -28,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() {
@@ -166,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
}
@@ -293,6 +300,19 @@ resolve() {
done
}
update_forwarders() {
# DO nothing when we do not use the ISP name servers
[ "${USE_ISP_NAMESERVERS}" != "on" ] && return 0
# 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
update_safe_search() {
local google_tlds=(
@@ -593,14 +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)