diff options
| author | Tomas Hozza <thozza@redhat.com> | 2015-06-29 12:13:59 +0200 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2015-06-29 13:33:28 +0200 |
| commit | 566e7ed5b9ba452f21bc0fa6512ac0e4d5f2d86e (patch) | |
| tree | 0cae4285fdaeba45bc58e96ae413305504fa12fa | |
| parent | 5196f25446a2dc1b324c621e3217e3f2cb20c2cc (diff) | |
| download | bind-566e7ed5b9ba452f21bc0fa6512ac0e4d5f2d86e.tar.gz bind-566e7ed5b9ba452f21bc0fa6512ac0e4d5f2d86e.tar.xz bind-566e7ed5b9ba452f21bc0fa6512ac0e4d5f2d86e.zip | |
Reintroduce the DISABLE_ZONE_CHECKING into /etc/sysconfig/named
Signed-off-by: Tomas Hozza <thozza@redhat.com>
| -rw-r--r-- | bind.spec | 5 | ||||
| -rw-r--r-- | named-chroot.service | 2 | ||||
| -rw-r--r-- | named-pkcs11.service | 2 | ||||
| -rw-r--r-- | named-sdb.service | 2 | ||||
| -rw-r--r-- | named.service | 2 | ||||
| -rw-r--r-- | named.sysconfig | 8 |
6 files changed, 15 insertions, 6 deletions
@@ -24,7 +24,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.10.2 -Release: 6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 7%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -996,6 +996,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jun 29 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.2-7.P1 +- Reintroduce the DISABLE_ZONE_CHECKING into /etc/sysconfig/named + * Fri Jun 19 2015 Tomas Hozza <thozza@redhat.com> - 32:9.10.2-6.P1 - Update to 9.10.2-P1 diff --git a/named-chroot.service b/named-chroot.service index 1829b3d..45d15e1 100644 --- a/named-chroot.service +++ b/named-chroot.service @@ -17,7 +17,7 @@ EnvironmentFile=-/etc/sysconfig/named Environment=KRB5_KTNAME=/etc/named.keytab PIDFile=/var/named/chroot/run/named/named.pid -ExecStartPre=/usr/sbin/named-checkconf -t /var/named/chroot -z /etc/named.conf +ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi' ExecStart=/usr/sbin/named -u named -t /var/named/chroot $OPTIONS ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID' diff --git a/named-pkcs11.service b/named-pkcs11.service index 7c53f48..6ce9001 100644 --- a/named-pkcs11.service +++ b/named-pkcs11.service @@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/named Environment=KRB5_KTNAME=/etc/named.keytab PIDFile=/run/named/named.pid -ExecStartPre=/usr/sbin/named-checkconf -z /etc/named.conf +ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi' ExecStart=/usr/sbin/named-pkcs11 -u named $OPTIONS ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID' diff --git a/named-sdb.service b/named-sdb.service index 99eb0e8..b3f57d1 100644 --- a/named-sdb.service +++ b/named-sdb.service @@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/named Environment=KRB5_KTNAME=/etc/named.keytab PIDFile=/run/named/named.pid -ExecStartPre=/usr/sbin/named-checkconf -z /etc/named.conf +ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi' ExecStart=/usr/sbin/named-sdb -u named $OPTIONS ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID' diff --git a/named.service b/named.service index 3e5ed9c..09bf377 100644 --- a/named.service +++ b/named.service @@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/named Environment=KRB5_KTNAME=/etc/named.keytab PIDFile=/run/named/named.pid -ExecStartPre=/usr/sbin/named-checkconf -z /etc/named.conf +ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z /etc/named.conf; else echo "Checking of zone files is disabled"; fi' ExecStart=/usr/sbin/named -u named $OPTIONS ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID' diff --git a/named.sysconfig b/named.sysconfig index 9a6c556..2326043 100644 --- a/named.sysconfig +++ b/named.sysconfig @@ -3,4 +3,10 @@ # # OPTIONS="whatever" -- These additional options will be passed to named # at startup. Don't add -t here, enable proper -# -chroot.service unit file. +# -chroot.service unit file. +# +# DISABLE_ZONE_CHECKING -- By default, service file calls named-checkzone +# utility for every zone to ensure all zones are +# valid before named starts. If you set this option +# to 'yes' then service file doesn't perform those +# checks. |