- rel 2

[packages/pdns.git] / pdns.init

diff --git a/pdns.init b/pdns.init
index dc51a5dc4922676557d300e1635b597d32e009a8..87965ed789a41eb819df07b432cd69ec601fa1c2 100644 (file)
--- a/pdns.init
+++ b/pdns.init
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pdns         This is controller stript for PowerDNS name server.
 #
-# chkconfig:   345 80 75
+# chkconfig:   345 85 15
 #
 # description: pdns is is a Domain Name Server (DNS) \
 #              that is used to resolve host names to IP addresses.
@@ -14,7 +14,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down "PowerDNS"
                exit 1
        fi
@@ -28,8 +28,7 @@ SOCKETPATH=/var/run
 
 cd /var/run
 suffix=`basename $0 | awk -F- '{print $2}'`
-if [ $suffix ] 
-then
+if [ $suffix ]; then
        EXTRAOPTS=--config-name=$suffix
        PROGNAME=pdns-$suffix
 else
@@ -39,44 +38,34 @@ fi
 pdns_server="/usr/sbin/pdns_server $EXTRAOPTS"
 
 doPC() {
-       ret=$(/usr/sbin/pdns_control $EXTRAOPTS $1 $2 2> /dev/null)
+       ret=$(/usr/bin/pdns_control $EXTRAOPTS $1 $2 2> /dev/null)
 }
 
 doPC ping
 NOTRUNNING=$?
 
-
+RETVAL=0
 case "$1" in
   status)
-       if test "$NOTRUNNING" = "0" ; then 
-               doPC status
-               echo $ret
-       else
-               msg_not_running "PowerDNS"
-               exit 1
-       fi 
-       ;;      
-
+       status pdns_server
+       exit $?
+       ;;
   stop)
-       if test "$NOTRUNNING" = "0"; then 
+       if test "$NOTRUNNING" = "0"; then
                msg_stopping "PowerDNS"
                doPC quit 2>&1 >/dev/null
-               [ $? ] && ok || fail
+               [ $? -eq 0 ] && ok || fail
                rm /var/lock/subsys/pdns
        else
                msg_not_running "PowerDNS"
-               exit 1
-       fi 
-       ;;              
-
+       fi
+       ;;
   force-stop)
        run_cmd "Killing PowerDNS without grace" killall -v -9 pdns_server
        ;;
-
   start)
-       if test "$NOTRUNNING" = "0"; then 
+       if test "$NOTRUNNING" = "0"; then
                msg_already_running "PowerDNS"
-               exit 1
        else
                msg_starting "PowerDNS (Powered DNS server)"
                daemon $pdns_server --daemon --guardian=yes
@@ -84,60 +73,61 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pdns
        fi
        ;;
-
-  force-reload | restart)
+  restart)
        $0 stop
        run_cmd "PowerDNS (3 sec. timeout)" sleep 3
        $0 start
+       exit $?
        ;;
-
-  reload) 
-       if test "$NOTRUNNING" = "0"; then 
+  reload|force-reload)
+       if test "$NOTRUNNING" = "0"; then
                show "Reloading PowerDNS"
                doPC cycle 2>&1 >/dev/null
-               [ $? ] && ok || fail
+               if [ $? -eq 0 ]; then
+                       ok
+               else
+                       fail
+                       RETVAL=1
+               fi
        else
-               msg_not_running "PowerDNS"
-               $0 start
-       fi 
-       ;;              
-               
+               msg_not_running "PowerDNS" >&2
+               exit 7
+       fi
+       ;;
   monitor)
-       if test "$NOTRUNNING" = "0"; then 
+       if test "$NOTRUNNING" = "0"; then
                msg_already_running "PowerDNS"
        else
                show "PowerDNS in foreground (testing mode)"
                $pdns_server --daemon=no --guardian=no --control-console --loglevel=9
-       fi 
-       ;;              
-
+       fi
+       ;;
   dump)
-       if test "$NOTRUNNING" = "0"; then 
+       if test "$NOTRUNNING" = "0"; then
                doPC list
                echo $ret
        else
                msg_not_running "PowerDNS"
-       fi 
-       ;;              
-
+       fi
+       ;;
   show)
        if [ $# -lt 2 ]; then
                msg_usage "$0 {show|mrtg|cricket} <variable_name_from_pdns_dump>"
-               exit 1
-       fi 
-       if test "$NOTRUNNING" = "0"; then 
+               exit 2
+       fi
+       if test "$NOTRUNNING" = "0"; then
                echo -n "$2="
                doPC show $2 ; echo $ret
        else
                msg_not_running "PowerDNS"
-       fi 
-       ;;              
+       fi
+       ;;
   mrtg)
        if [ $# -lt 2 ]; then
                msg_usage "$0 {show|mrtg|cricket} <variable_name_from_pdns_dump>"
-               exit 1
-       fi 
-       if test "$NOTRUNNING" = "0"; then 
+               exit 2
+       fi
+       if test "$NOTRUNNING" = "0"; then
                doPC show $2 ; echo $ret
                if [ "$3x" != "x" ]; then
                        doPC show $3 ; echo $ret
@@ -147,27 +137,25 @@ case "$1" in
                doPC uptime ; echo $ret
                echo PowerDNS daemon
        else
-               msg_not_running "PowerDNS"
-               exit 1
-       fi 
-       ;;              
-
+               msg_not_running "PowerDNS" >&2
+               exit 7
+       fi
+       ;;
   cricket)
        if [ $# -lt 2 ]; then
                msg_usage "$0 {show|mrtg|cricket} <variable_name_from_pdns_dump>"
-               exit 1
-       fi 
-       if test "$NOTRUNNING" = "0"; then 
+               exit 2
+       fi
+       if test "$NOTRUNNING" = "0"; then
                doPC show $2 ; echo $ret
        else
-               msg_not_running "PowerDNS"
-               exit 1
-       fi 
-       ;;              
-
-  *)
-       msg_usage "$0 {start|stop|reload|force-reload|restart|status|dump|show|mrtg|cricket|monitor} [...]"
+               msg_not_running "PowerDNS" >&2
+               exit 7
+       fi
        ;;
+  *)
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status|dump|show|mrtg|cricket|monitor} [...]"
+       exit 3
 esac
 
 exit $RETVAL