- s/httpd/apache/ s/apxs/apxs1/

Changed files:
    apache1.init -> 1.10

diff --git a/apache1.init b/apache1.init
index 9e6a87c871d42c54664c4fda7eaa691ca3bb6753..8edad64d1810bdfb956355e89d876dbdcb2866a5 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
@@ -23,7 +23,7 @@
 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 httpd
+               msg_network_down apache
                exit 1
        fi
 else
@@ -39,29 +39,29 @@ RETVAL=0
 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
+       if [ ! -f /var/lock/subsys/apache ]; then
+               msg_starting apache
+               daemon apache $HTTPD_OPTS
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
        else
-               msg_already_running httpd
+               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
+       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 httpd
+               msg_not_running apache
        fi
        ;;
   status)
-       status httpd
+       status apache
        RETVAL=$?
-       /usr/sbin/httpd -S
+       /usr/sbin/apache -S
        ;;
   restart)
        $0 stop
@@ -69,22 +69,22 @@ case "$1" in
        exit $?
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd
-               killproc httpd -HUP
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_reloading apache
+               killproc apache -HUP
                RETVAL=$?
        else
-               msg_not_running httpd >&2
+               msg_not_running apache >&2
                RETVAL=7
        fi
        ;;
   graceful)
-       if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd
-               killproc httpd -USR1
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_reloading apache
+               killproc apache -USR1
                RETVAL=$?
         else
-               msg_not_running httpd >&2
+               msg_not_running apache >&2
                RETVAL=7
        fi
        ;;