From a0b3ac07c71bb70e51a788cd61fc9a6a51718d21 Mon Sep 17 00:00:00 2001 From: Artem Egorenkov Date: Wed, 21 Apr 2021 15:12:12 +0200 Subject: [PATCH] DISABLE_UNBOUND_ANCHOR == "yes" disable unbound-anchor on unbound.service startup Resolves: rhbz#1951923 --- unbound.service | 2 +- unbound.spec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/unbound.service b/unbound.service index 287fe8d..49dc7bd 100644 --- a/unbound.service +++ b/unbound.service @@ -11,7 +11,7 @@ Wants=nss-lookup.target Type=simple EnvironmentFile=-/etc/sysconfig/unbound ExecStartPre=/usr/sbin/unbound-checkconf -ExecStartPre=-/usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem -f /etc/resolv.conf -R +ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_UNBOUND_ANCHOR" == "yes" ]; then /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem -f /etc/resolv.conf -R; else echo "Updates of root keys with unbound-anchor is disabled"; fi' ExecStart=/usr/sbin/unbound -d $UNBOUND_OPTIONS ExecReload=/usr/sbin/unbound-control reload diff --git a/unbound.spec b/unbound.spec index e4964db..a871990 100644 --- a/unbound.spec +++ b/unbound.spec @@ -458,8 +458,10 @@ popd %attr(0644,root,root) %config %{_sysconfdir}/%{name}/root.key %changelog -* Fri Apr 16 2021 Mohan Boddu - 1.13.1-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Apr 06 2021 Artem Egorenkov - 1.13.1-4 +- Don't start unbound-anchor before unbound service if DISABLE_UNBOUND_ANCHOR + environment variable equals to "yes" +- Resolves: rhbz#1951923 * Wed Feb 10 2021 Paul Wouters - 1.13.1-1 - Resolves rhbz#1860887 unbound-1.13.1 is available