- /home/httpd -> /home/services/httpd

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 0afc17176493fa6b2d758a1a3069126c716d92e6..ab6650488f31990a964c134e24fdd8daa43183c1 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -22,37 +22,55 @@
 [ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
 
 # Check that networking is up.
-[ "${NETWORKING}" = "no" ] && echo "Error: Networking is down" && exit 0
-
+if is_no "${NETWORKING}"; then
+        # nls "ERROR: Networking is down. %s can't be run." <service>
+        msg_network_down httpd
+        exit 1
+fi
 
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/httpd ]; then
-               show Starting httpd
-               daemon httpd
+        if [ ! -f /var/lock/subsys/httpd ]; then
+               msg_starting httpd
+               daemon httpd $HTTPD_OPTS
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               echo "httpd already is running"
+               msg_already_running httpd
+               exit 1
        fi
-       touch /var/lock/subsys/httpd
        ;;
   stop)
-       show Shutting down httpd
-       killproc httpd  
-       rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc*
+        # Stop daemons.
+       if [ -f /var/lock/subsys/httpd ]; then
+                msg_stopping httpd
+                killproc httpd
+                rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
+        else
+               msg_not_running httpd
+               exit 1
+       fi
        ;;
   status)
        status httpd
+       /usr/sbin/httpd -S
+       exit $?
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
        ;;
+   reload)
+       msg_reloading httpd
+       killproc httpd -HUP
+       RETVAL=$?
+       ;;
   *)
-       echo "Usage: $0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
        ;;
 esac
 
-exit 0
+exit $RETVAL