- separate subpackage for plugins

[packages/bind.git] / named.init

diff --git a/named.init b/named.init
index 1a77c34192c2ba50b2fa001ddaa006f14bd973e5..f22b6489b32dfce1aecc4b7c653c084e0a41325d 100644 (file)
--- a/named.init
+++ b/named.init
@@ -36,31 +36,96 @@ fi
 
 [ -n "$NUM_CPUS" ] && NAMED_OPT="$NAMED_OPT -n $NUM_CPUS"
 
-start() {
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/named ]; then
-               msg_starting "Named"
-               modprobe -s capability > /dev/null 2>&1
-               [ -f /etc/localtime ] && cp -aL /etc/localtime $CHROOT_TO_DIR/etc/localtime
-               touch $CHROOT_TO_DIR/named.log && \
-                       chown named:named $CHROOT_TO_DIR/named.log
-               daemon --pidfile /var/lib/named/named.pid /usr/sbin/named -u named \
-                       -t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
+# configtest itself
+configtest() {
+       /usr/bin/named-checkconf -j -t $CHROOT_TO_DIR 2>&1
+       return $?
+}
+
+checkconfig() {
+       local details=${1:-0}
+
+       if [ $details -eq 1 ]; then
+               # run config test and display report (status action)
+               show "Checking %s configuration" "Named"; busy
+               local out
+               out=`configtest 2>&1`
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
+               [ $RETVAL -eq 0 ] && ok || fail
+               [ "$out" ] && echo >&2 "$out"
        else
+               # run config test and abort with nice message if failed
+               # (for actions checking status before action).
+               show "Checking %s configuration" "Named"; busy
+               configtest >/dev/null 2>&1
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       ok
+               else
+                       fail
+                       nls 'Configuration test failed. See details with %s "checkconfig"' $0
+                       exit $RETVAL
+               fi
+       fi
+}
+
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/named ]; then
                msg_already_running "Named"
+               return
        fi
+
+       [ "$1" -eq 0 ] || checkconfig
+       msg_starting "Named"
+       modprobe -s capability > /dev/null 2>&1
+       [ -f /etc/localtime ] && cp -puL /etc/localtime $CHROOT_TO_DIR/etc/localtime
+       touch $CHROOT_TO_DIR/named.log && \
+               chown named:named $CHROOT_TO_DIR/named.log
+       daemon --pidfile $CHROOT_TO_DIR/named.pid /usr/sbin/named -u named \
+               -t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
 }
 
 stop() {
-       if [ -f /var/lock/subsys/named ]; then
-               msg_stopping "Named"
-               killproc --pidfile /var/lib/named/named.pid named
-               rm -f /var/lock/subsys/named >/dev/null 2>&1
+       if [ ! -f /var/lock/subsys/named ]; then
+               msg_not_running "Named"
+               return
+       fi
+
+       msg_stopping "Named"
+       killproc --pidfile $CHROOT_TO_DIR/named.pid named
+       rm -f /var/lock/subsys/named >/dev/null 2>&1
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/named ]; then
+               msg_not_running "Named"
+               RETVAL=7
+               return
+       fi
+
+       checkconfig
+       if [ -f /etc/rndc.conf ]; then
+               run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
        else
+               msg_reloading "Named"
+               killproc named -HUP
+               RETVAL=$?
+       fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/named ]; then
                msg_not_running "Named"
+               RETVAL=$1
+               return
        fi
+
+       checkconfig
+       stop
+       start
 }
 
 RETVAL=0
@@ -72,6 +137,20 @@ case "$1" in
   stop)
        stop
        ;;
+  restart)
+       checkconfig
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  reload|force-reload)
+       reload
+       ;;
+  checkconfig|configtest)
+       checkconfig 1
+       ;;
   status)
        status named
        RETVAL=$?
@@ -83,27 +162,8 @@ case "$1" in
                fi
        fi
        ;;
-  reload|force-reload)
-       if [ -f /var/lock/subsys/named ]; then
-               if [ -f /etc/rndc.conf ]; then
-                       run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
-               else
-                       msg_reloading "Named"
-                       killproc named -HUP
-                       RETVAL=$?
-               fi
-       else
-               msg_not_running "Named"
-               exit 7
-       fi
-
-       ;;
-  restart)
-       stop
-       start
-       ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|configtest|status}"
        exit 3
 esac