diff options
Diffstat (limited to 'bind-chroot-admin.in')
| -rw-r--r-- | bind-chroot-admin.in | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index e11d7e6..d92b74b 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -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 |