- fixed relation between logrotate and chroot-ed named
This commit is contained in:
Adam Tkac
parent
2be0bc65f4
commit
a7cf97ec50
|
|
@ -207,27 +207,6 @@ function disable_bind_chroot()
|
|||
/bin/sed -i -e '/^ROOTDIR=/d' /etc/sysconfig/named;
|
||||
}
|
||||
|
||||
function master_zone_writes_enabled()
|
||||
{
|
||||
if selinux_enabled; then
|
||||
if [ -x /usr/sbin/getsebool ]; then
|
||||
named_write_master_zones=`/usr/sbin/getsebool named_write_master_zones | cut -d' ' -f3`;
|
||||
if [ $named_write_master_zones = "on" ]; then
|
||||
return 0;
|
||||
else
|
||||
return 1;
|
||||
fi;
|
||||
fi;
|
||||
fi;
|
||||
|
||||
. /etc/sysconfig/named
|
||||
if `echo "$ENABLE_ZONE_WRITE" | grep -q '[yY1].*'`; then
|
||||
return 0;
|
||||
fi;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
function sync_files()
|
||||
{
|
||||
rootdir;
|
||||
|
|
@ -249,6 +228,7 @@ function sync_files()
|
|||
do
|
||||
/bin/rm -f $f >/dev/null 2>&1;
|
||||
done
|
||||
ln -sf ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log
|
||||
pfx=${BIND_CHROOT_PREFIX}
|
||||
else # chroot is disabled
|
||||
/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 |
|
||||
|
|
@ -259,6 +239,8 @@ function sync_files()
|
|||
[ ! -e $changed ] && touch $changed;
|
||||
fi;
|
||||
done
|
||||
[ -L /var/log/named.log ] && rm -f /var/log/named.log
|
||||
[ -e ${BIND_CHROOT_PREFIX}/var/log/named.log ] && mv -f ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log
|
||||
fi;
|
||||
if [ ! -e ${pfx}/etc/rndc.key ]; then
|
||||
echo 'key "rndckey" {
|
||||
|
|
@ -268,13 +250,8 @@ function sync_files()
|
|||
elif /bin/egrep -q '@KEY@' /etc/rndc.key; then
|
||||
/bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
|
||||
fi
|
||||
if master_zone_writes_enabled; then
|
||||
chown -h named:named /var/named/* >/dev/null 2>&1;
|
||||
chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
|
||||
else
|
||||
chown -h root:named /var/named/* >/dev/null 2>&1;
|
||||
chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
|
||||
fi
|
||||
chown -h root:named /var/named/* >/dev/null 2>&1;
|
||||
chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1;
|
||||
chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1;
|
||||
chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1;
|
||||
chmod 750 ${pfx}/var/named >/dev/null 2>&1;
|
||||
|
|
@ -300,7 +277,7 @@ function sync_files()
|
|||
/sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
|
||||
/sbin/restorecon /var/named/named.ca >/dev/null 2>&1;
|
||||
fi;
|
||||
/sbin/service named condrestart
|
||||
/sbin/service named try-restart
|
||||
rm -f $changed;
|
||||
fi;
|
||||
if [ $ng -eq 1 ]; then
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
|
|||
Name: bind
|
||||
License: BSD-like
|
||||
Version: 9.5.0a5
|
||||
Release: 3.9%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Epoch: 31
|
||||
Url: http://www.isc.org/products/BIND/
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -322,6 +322,7 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/rndc.key
|
|||
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null
|
||||
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random
|
||||
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/zero
|
||||
touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/var/log/named.log
|
||||
#end chroot
|
||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
||||
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.conf
|
||||
|
|
@ -672,6 +673,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%dir %{chroot_prefix}/var/named/dynamic
|
||||
%dir %{chroot_prefix}/var/run/named
|
||||
%dir %{chroot_prefix}/var/tmp
|
||||
%dir %{chroot_prefix}/var/log
|
||||
%ghost %{chroot_prefix}/var/log/named.log
|
||||
%ghost %{chroot_prefix}/dev/null
|
||||
%ghost %{chroot_prefix}/dev/random
|
||||
%ghost %{chroot_prefix}/dev/zero
|
||||
|
|
@ -679,6 +682,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%{_sbindir}/bind-chroot-admin
|
||||
|
||||
%changelog
|
||||
* Fri Jul 20 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-4.fc8
|
||||
- fixed relation between logrotated and chroot-ed named
|
||||
|
||||
* Wed Jul 18 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-3.9.fc8
|
||||
- removed bind-sdb package (default named has compiled SDB backend now)
|
||||
- integrated DLZ (Dynamically loadable zones) drivers
|
||||
|
|
|
|||
Loading…
Reference in New Issue