lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

unbound: do not start DHCP watcher immediately after daemonizing unbound (#5920)

Browse Source
This commit is contained in:
Stephan de Wit 2022-08-02 10:33:59 +02:00 committed by GitHub
parent bb4743a732
commit 966e54011e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/inc/plugins.inc.d/unbound.inc
View File

@ -396,6 +396,7 @@ function unbound_cache_flush()
function unbound_configure_do($verbose = false, $unused = '')
{
global $config;
$domain = '';
if (empty($config['unbound']['cacheflush'])) {
if (isvalidpid('/var/run/unbound.pid')) {
@ -419,16 +420,15 @@ function unbound_configure_do($verbose = false, $unused = '')
flush();
}
mwexec_bg('/usr/local/bin/flock -n -E 0 -o /tmp/unbound_start.lock /usr/local/opnsense/scripts/unbound/start.sh');
if (isset($config['unbound']['regdhcp'])) {
$domain = $config['system']['domain'];
if (isset($config['unbound']['regdhcpdomain'])) {
$domain = $config['unbound']['regdhcpdomain'];
}
mwexecf('/usr/local/opnsense/scripts/dhcp/unbound_watcher.py --domain %s', $domain);
}
mwexecf_bg('/usr/local/bin/flock -n -E 0 -o /tmp/unbound_start.lock /usr/local/opnsense/scripts/unbound/start.sh %s', [$domain]);
if ($verbose) {
echo "done.\n";
}

8
src/opnsense/scripts/unbound/start.sh
View File

@ -30,6 +30,8 @@ set -e
# prepare and startup unbound, so we can easily background it
DOMAIN=${1}
# if the root.key file is missing or damaged, run unbound-anchor
if ! /usr/local/sbin/unbound-checkconf /var/unbound/unbound.conf 2> /dev/null; then
# unbound-anchor has undefined behaviour if file is corrupted, start clean
@ -46,7 +48,7 @@ if ! /usr/local/sbin/unbound-checkconf /var/unbound/unbound.conf 2> /dev/null; t
fi
if [ ! -f /var/unbound/unbound_control.key ]; then
chroot -u unbound -g unbound / /usr/local/sbin/unbound-control-setup -d /var/unbound
chroot -u unbound -g unbound / /usr/local/sbin/unbound-control-setup -d /var/unbound
fi
for FILE in $(find /var/unbound/etc -depth 1); do
@ -61,3 +63,7 @@ chown -R unbound:unbound /var/unbound
/usr/local/sbin/unbound -c /var/unbound/unbound.conf
/usr/local/opnsense/scripts/unbound/cache.sh load
if [ -n "${DOMAIN}" ]; then
/usr/local/opnsense/scripts/dhcp/unbound_watcher.py --domain ${DOMAIN}
fi