- pldized

Changed files:
    dc_client.init -> 1.2

diff --git a/dc_client.init b/dc_client.init
index 8084c18b8e70503653b027699393de2d16b5b8ab..e14c140e897f68ef121fcfe0b26890fcf4043f00 100755 (executable)
--- a/dc_client.init
+++ b/dc_client.init
@@ -2,77 +2,84 @@
 #
 # distcache    Startup script for the Distcache SSL Session Cache Client Proxy
 #
-# chkconfig: - 88 12
-# description: Distcache is a Distributed SSL Session Cache Client Proxy.
-# processname: dc_client
-# config: /etc/sysconfig/distcache
-# pidfile: /var/run/dc_client.pid
+# chkconfig:   345 88 12
+# description: Distcache is a Distributed SSL Session Cache Client Proxy.
+# processname: dc_client
+# config:              /etc/sysconfig/distcache
+# pidfile:             /var/run/dc_client.pid
+#
+# $Id$
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+# Get network config
+. /etc/sysconfig/network
+
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down dc_client
+               exit 1
+       fi
+else
+       exit 0
+fi
+
+# Get service config
 if [ -f /etc/sysconfig/distcache ]; then
-        . /etc/sysconfig/distcache
+       . /etc/sysconfig/distcache
 fi
 
 port=${PORT-5555}
 socket=${SOCKET-/var/cache/mod_ssl/distcache}
 server=${SERVER-localhost}:${port}
-owner=${OWNER-apache}
+owner=${OWNER-http}
 
-prog=dc_client
-RETVAL=0
 runas=nobody
 dc_client=/usr/bin/dc_client
 pidfile=/var/run/dc_client.pid
 
 OPTIONS="-daemon -pidfile ${pidfile} -listen UNIX:${socket} \
-         -sockowner ${owner} -sockperms 0600 -user ${runas} -server IP:${server}"
-
-start() {
-        echo -n $"Starting $prog: "
-        daemon $dc_client $OPTIONS
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch /var/lock/subsys/dc_client
-        return $RETVAL
-}
-stop() {
-       echo -n $"Stopping $prog: "
-       killproc $dc_client
-       RETVAL=$?
-       echo
-       [ $RETVAL = 0 ] && rm -f /var/lock/subsys/dc_client /var/run/dc_client.pid
-}
+       -sockowner ${owner} -sockperms 0600 -user ${runas} -server IP:${server}"
 
 # See how we were called.
 case "$1" in
-  start)
-       start
+start)
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/dc_client ]; then
+               msg_starting dc_client
+               daemon $dc_client $OPTIONS
+               RETVAL=$?
+               [ $RETVAL = 0 ] && touch /var/lock/subsys/dc_client
+       else
+               msg_already_running dc_client
+       fi
        ;;
-  stop)
-       stop
+stop)
+       if [ -f /var/lock/subsys/dc_client ]; then
+               # Stop daemons.
+               msg_stopping dc_client
+               killproc $dc_client
+               rm -f /var/lock/subsys/dc_client /var/run/dc_client.pid
+       else
+               msg_not_running dc_client
+       fi
        ;;
-  status)
-        status $dc_client
+status)
+       status $dc_client
        RETVAL=$?
        ;;
-  restart)
-       stop
-       start
-       ;;
-  condrestart)
-       if [ -f /var/run/dc_client.pid ] ; then
-               stop
-               start
-       fi
-       ;;
-  reload)
-        reload
+restart|reload|force-reload)
+       $0 stop
+       $0 start
        ;;
-  *)
-       echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
-       exit 1
+*)
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL
+
+# This must be last line !
+# vi:syntax=sh:tw=78:ts=4:sw=4