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

unbound: Write hosts to unbound configuration file

Browse Source 
This will allow us to read more hosts in a shorter time.

Fixes: #11743
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2020-01-13 21:10:18 +01:00
parent 903247fef8
commit 6137797cb3
2 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/unbound/unbound.conf
View File

@@ -85,6 +85,9 @@ server:
# Include DHCP leases
include: "/etc/unbound/dhcp-leases.conf"
# Include hosts
include: "/etc/unbound/hosts.conf"
# Include any forward zones
include: "/etc/unbound/forward.conf"

72
src/initscripts/system/unbound
View File

@@ -58,47 +58,45 @@ config_header() {
echo
}
own_hostname() {
local hostname=$(hostname -f)
# 1.1.1.1 is reserved for unused green, skip this
if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then
unbound-control -q local_data "${hostname} ${LOCAL_TTL} IN A ${GREEN_ADDRESS}"
fi
write_hosts_conf() {
(
config_header
local address
for address in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do
[ -n "${address}" ] || continue
[ "${address}" = "1.1.1.1" ] && continue
# Make own hostname resolveable
# 1.1.1.1 is reserved for unused green, skip this
if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then
echo "local-data: \"${HOSTNAME} ${LOCAL_TTL} IN A ${GREEN_ADDRESS}\""
fi
address=$(ip_address_revptr ${address})
unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${hostname}"
done
}
local address
for address in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do
[ -n "${address}" ] || continue
[ "${address}" = "1.1.1.1" ] && continue
update_hosts() {
# Make own hostname resolveable
own_hostname
address=$(ip_address_revptr ${address})
echo "local-data: \"${address} ${LOCAL_TTL} IN PTR ${HOSTNAME}\""
done
local enabled address hostname domainname generateptr
# Add all hosts
local enabled address hostname domainname generateptr
while IFS="," read -r enabled address hostname domainname generateptr; do
[ "${enabled}" = "on" ] || continue
while IFS="," read -r enabled address hostname domainname generateptr; do
[ "${enabled}" = "on" ] || continue
# Build FQDN
local fqdn="${hostname}.${domainname}"
echo "local-data: \"${fqdn} ${LOCAL_TTL} IN A ${address}\""
# Build FQDN
local fqdn="${hostname}.${domainname}"
# Skip reverse resolution if the address equals the GREEN address
[ "${address}" = "${GREEN_ADDRESS}" ] && continue
unbound-control -q local_data "${fqdn} ${LOCAL_TTL} IN A ${address}"
# Skip reverse resolution if user requested not to do so
[ "${generateptr}" = "off" ] && continue
# Skip reverse resolution if the address equals the GREEN address
[ "${address}" = "${GREEN_ADDRESS}" ] && continue
# Skip reverse resolution if user requested not to do so
[ "${generateptr}" = "off" ] && continue
# Add RDNS
address=$(ip_address_revptr ${address})
unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${fqdn}"
done < /var/ipfire/main/hosts
# Add RDNS
address=$(ip_address_revptr ${address})
echo "local-data: \"${address} ${LOCAL_TTL} IN PTR ${fqdn}\""
done < /var/ipfire/main/hosts
) > /etc/unbound/hosts.conf
}
write_forward_conf() {
@@ -573,6 +571,7 @@ case "$1" in
# Update configuration files
write_tuning_conf
write_hosts_conf
write_forward_conf
boot_mesg "Starting Unbound DNS Proxy..."
@@ -582,9 +581,6 @@ case "$1" in
if [ -e "/var/ipfire/red/active" ]; then
update_safe_search
fi
# Update hosts
update_hosts
;;
stop)
@@ -600,15 +596,13 @@ case "$1" in
reload)
# Update configuration files
write_forward_conf
write_hosts_conf
# Update Safe Search rules if the system is online.
if [ -e "/var/ipfire/red/active" ]; then
update_safe_search
fi
# Update hosts.
update_hosts
# Call unbound-control and perform the reload
/usr/sbin/unbound-control -q reload
;;