rpms/bind/devel bind-chroot-admin.in, 1.24, 1.25 bind.spec, 1.195, 1.196 sources, 1.37, 1.38
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Fri Jul 20 12:54:07 UTC 2007
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27135
Modified Files:
bind-chroot-admin.in bind.spec sources
Log Message:
- fixed relation between logrotate and chroot-ed named
Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bind-chroot-admin.in 4 Jun 2007 13:44:35 -0000 1.24
+++ bind-chroot-admin.in 20 Jul 2007 12:53:34 -0000 1.25
@@ -207,27 +207,6 @@
/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 @@
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 @@
[ ! -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 @@
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 @@
/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
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- bind.spec 20 Jul 2007 11:31:19 -0000 1.195
+++ bind.spec 20 Jul 2007 12:53:34 -0000 1.196
@@ -18,7 +18,7 @@
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}/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 @@
%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 @@
%{_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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 2 Jul 2007 15:31:28 -0000 1.37
+++ sources 20 Jul 2007 12:53:34 -0000 1.38
@@ -1,4 +1,4 @@
beb3f6e7e8e1f804d1fb79dd11319e1e bind-9.5.0a5.tar.gz
-dd2b4f4b795a0a989b0a01f93db3a57b bind-chroot.tar.bz2
+4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2
bdea8168751a29e61525f11e8195ad48 config.tar
13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz
More information about the scm-commits
mailing list