- nicer messages

[packages/apache1.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index 0432b79a7725dffdd4d6f4521d69ce8b6f11622e..ae174076a2eada8f9b5b47b08b2a9737bfbcdad3 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -5,9 +5,9 @@
 # chkconfig:   345 85 15
 # description: Apache is a World Wide Web server.  It is used to serve \
 #              HTML files and CGI.
-# processname: httpd
-# pidfile:     /var/run/httpd.pid
-# config:      /etc/httpd/httpd.conf
+# processname: apache
+# pidfile:     /var/run/apache.pid
+# config:      /etc/apache/apache.conf
 
 
 # Source function library
@@ -17,56 +17,80 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
+[ -f /etc/sysconfig/apache1 ] && . /etc/sysconfig/apache1
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_network_down httpd
-        exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               # nls "ERROR: Networking is down. %s can't be run." <service>
+               msg_network_down apache
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 if is_no "${IPV6_NETWORKING}"; then
-        HTTPD_OPTS="$HTTPD_OPTS -4"
+       HTTPD_OPTS="$HTTPD_OPTS -4"
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/httpd ]; then
-               msg_starting httpd
-               daemon httpd $HTTPD_OPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
+       if [ ! -f /var/lock/subsys/apache ]; then
+               msg_starting apache
+               daemon apache $HTTPD_OPTS
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
        else
-               msg_already_running httpd
-               exit 1
+               msg_already_running apache
        fi
        ;;
   stop)
-        # 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
+       # Stop daemons.
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_stopping apache
+               killproc apache
+               rm -f /var/lock/subsys/apache /var/run/.pid /var/run/apache.loc* >/dev/null 2>&1
+       else
+               msg_not_running apache
        fi
        ;;
   status)
-       status httpd
-       /usr/sbin/httpd -S
-       exit $?
+       status apache
+       RETVAL=$?
+       /usr/sbin/apache -S
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
+       exit $?
+       ;;
+  reload|force-reload)
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_reloading apache
+               killproc apache -HUP
+               RETVAL=$?
+       else
+               msg_not_running apache >&2
+               RETVAL=7
+       fi
+       ;;
+  graceful)
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_reloading apache
+               killproc apache -USR1
+               RETVAL=$?
+        else
+               msg_not_running apache >&2
+               RETVAL=7
+       fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       exit 3
        ;;
 esac