Change named-checkonf path to bin
Upstream changed named-checkconf directory to bin. Add compatibility symlinks. Change full paths in services to point to new full path.
This commit is contained in:
parent
f4e18045d9
commit
50c017891b
|
@ -627,6 +627,17 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
||||||
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
|
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
|
||||||
install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
|
install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
|
||||||
|
|
||||||
|
pushd ${RPM_BUILD_ROOT}%{_sbindir}
|
||||||
|
# Compatibility with previous major versions
|
||||||
|
for BIN in named-checkconf named-compilezone nsec3hash
|
||||||
|
do
|
||||||
|
ln -s ../bin/$BIN $BIN
|
||||||
|
done
|
||||||
|
%if %{with LMDB}
|
||||||
|
ln -s ../bin/named-nzd2nzf
|
||||||
|
%endif
|
||||||
|
popd
|
||||||
|
|
||||||
%if %{with DLZ}
|
%if %{with DLZ}
|
||||||
pushd build
|
pushd build
|
||||||
pushd contrib/dlz/modules
|
pushd contrib/dlz/modules
|
||||||
|
@ -760,7 +771,7 @@ else
|
||||||
/sbin/usermod -s /sbin/nologin named
|
/sbin/usermod -s /sbin/nologin named
|
||||||
fi
|
fi
|
||||||
# Checkconf will parse out comments
|
# Checkconf will parse out comments
|
||||||
if /usr/sbin/named-checkconf -p /etc/named.conf 2>/dev/null | grep -q named.iscdlv.key
|
if /usr/bin/named-checkconf -p /etc/named.conf 2>/dev/null | grep -q named.iscdlv.key
|
||||||
then
|
then
|
||||||
echo "Replacing obsolete named.iscdlv.key with named.root.key..."
|
echo "Replacing obsolete named.iscdlv.key with named.root.key..."
|
||||||
if cp -Rf --preserve=all --remove-destination /etc/named.conf /etc/named.conf.rpmbackup; then
|
if cp -Rf --preserve=all --remove-destination /etc/named.conf /etc/named.conf.rpmbackup; then
|
||||||
|
|
|
@ -17,7 +17,7 @@ EnvironmentFile=-/etc/sysconfig/named
|
||||||
Environment=KRB5_KTNAME=/etc/named.keytab
|
Environment=KRB5_KTNAME=/etc/named.keytab
|
||||||
PIDFile=/var/named/chroot/run/named/named.pid
|
PIDFile=/var/named/chroot/run/named/named.pid
|
||||||
|
|
||||||
ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -t /var/named/chroot -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
|
ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/bin/named-checkconf -t /var/named/chroot -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
|
||||||
ExecStart=/usr/sbin/named -u named -c ${NAMEDCONF} -t /var/named/chroot $OPTIONS
|
ExecStart=/usr/sbin/named -u named -c ${NAMEDCONF} -t /var/named/chroot $OPTIONS
|
||||||
|
|
||||||
ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
|
ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
|
||||||
|
|
|
@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/named
|
||||||
Environment=KRB5_KTNAME=/etc/named.keytab
|
Environment=KRB5_KTNAME=/etc/named.keytab
|
||||||
PIDFile=/run/named/named.pid
|
PIDFile=/run/named/named.pid
|
||||||
|
|
||||||
ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
|
ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/bin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
|
||||||
ExecStart=/usr/sbin/named-pkcs11 -u named -c ${NAMEDCONF} $OPTIONS
|
ExecStart=/usr/sbin/named-pkcs11 -u named -c ${NAMEDCONF} $OPTIONS
|
||||||
|
|
||||||
ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
|
ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
|
||||||
|
|
|
@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/named
|
||||||
Environment=KRB5_KTNAME=/etc/named.keytab
|
Environment=KRB5_KTNAME=/etc/named.keytab
|
||||||
PIDFile=/run/named/named.pid
|
PIDFile=/run/named/named.pid
|
||||||
|
|
||||||
ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
|
ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/bin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
|
||||||
ExecStart=/usr/sbin/named -u named -c ${NAMEDCONF} $OPTIONS
|
ExecStart=/usr/sbin/named -u named -c ${NAMEDCONF} $OPTIONS
|
||||||
ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
|
ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue