- cleaning

Changed files:
    apache.init -> 1.13
    apache1.init -> 1.3

diff --git a/apache.init b/apache.init
index ab6650488f31990a964c134e24fdd8daa43183c1..37a40b1c72e463d5b5f6efed5ab2633408ef3c9b 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -22,35 +22,39 @@
 [ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
 
 # 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 ]; then
+               # nls "ERROR: Networking is down. %s can't be run." <service>
+               msg_network_down httpd
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/httpd ]; then
+       if [ ! -f /var/lock/subsys/httpd ]; then
                msg_starting httpd
                daemon httpd $HTTPD_OPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_already_running httpd
-               exit 1
+               msg_already_running httpd
+               exit 1
        fi
        ;;
   stop)
-        # Stop daemons.
+       # 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_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
+               exit 1
        fi
        ;;
   status)
@@ -62,10 +66,12 @@ case "$1" in
        $0 stop
        $0 start
        ;;
-   reload)
-       msg_reloading httpd
+  reload)
+       msg_reloading httpd
+       busy
        killproc httpd -HUP
        RETVAL=$?
+       [ $RETVAL -eq 0 ] && ok || died
        ;;
   *)
        msg_usage "$0 {start|stop|restart|reload|status}"

diff --git a/apache1.init b/apache1.init
index 824c9a57856d2d79b64b65b7af342003c84b6503..d659c0c242bc25dbbe012e5bfa89171528b2373c 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -20,39 +20,43 @@
 [ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
 
 # 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 ]; then
+               # nls "ERROR: Networking is down. %s can't be run." <service>
+               msg_network_down httpd
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 if is_no "${IPV6_NETWORKING}"; then
-        HTTPD_OPTS="$HTTPD_OPTS -4"
+       HTTPD_OPTS="$HTTPD_OPTS -4"
 fi
 
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/httpd ]; then
+       if [ ! -f /var/lock/subsys/httpd ]; then
                msg_starting httpd
                daemon httpd $HTTPD_OPTS
-               RETVAL=$?
+               RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_already_running httpd
-               exit 1
+               msg_already_running httpd
+               exit 1
        fi
        ;;
   stop)
-        # Stop daemons.
+       # 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_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
+               exit 1
        fi
        ;;
   status)