- killed trailing spaces/tabs

[packages/boa.git] / boa.init

diff --git a/boa.init b/boa.init
index 7b1d80f692bf38665093331ca92da6847a9758d4..b910c062bd40ee5487a6f85303678e01b66ee394 100644 (file)
--- a/boa.init
+++ b/boa.init
@@ -6,7 +6,7 @@
 # description: Boa is a World Wide Web server.  It is used to serve \
 #              HTML files and CGI.
 # processname: boa
-# config:      /etc/httpd/boa.conf
+# config:      /etc/boa.conf
 
 
 # Source function library
@@ -19,12 +19,16 @@
 [ -f /etc/sysconfig/boa ] && . /etc/sysconfig/boa
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_Network_Down "Boa httpd"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "Boa httpd"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -35,49 +39,41 @@ case "$1" in
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/boa
        else
-               msg_Already_Running "Boa httpd"
-               exit 1
+               msg_already_running "Boa httpd"
        fi
-        ;;
+       ;;
   stop)
-        # Stop daemons.
+       # Stop daemons.
        if [ -f /var/lock/subsys/boa ]; then
                msg_stopping "Boa httpd"
                killproc boa
                rm -f /var/lock/subsys/boa >/dev/null 2>&1
        else
-               msg_Not_Running "Boa httpd"
-               exit 1
-       fi      
-        ;;
+               msg_not_running "Boa httpd"
+       fi
+       ;;
   restart)
-        $0 stop
+       $0 stop
        $0 start
-        ;;
-  reload)
+       exit $?
+       ;;
+  reload|force-reload)
        if [ -f /var/lock/subsys/boa ]; then
-               msg_show "Boa httpd"
-               msg_reload
-               busy
+               msg_reloading "Boa httpd"
                killproc boa -HUP
-               deltext
-               ok              
+               RETVAL=$?
        else
-               msg_Not_Running "Boa httpd"
-               exit 1
+               msg_not_running "Boa httpd" >&2
+               exit 7
        fi
        ;;
-  force-reload)
-       $0 reload
-       exit $?
-       ;;
   status)
        status boa
        exit $?
-        ;;
+       ;;
   *)
-       msg_Usage "$0 {start|stop|status|restart|reload|force-reload}"
-        exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL