- rel 2

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index b68bc76cba6dc1e2f240bf6c5567868a711c21cf..64e6cadf45073a9ab399e448c89afa814229c441 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -7,10 +7,7 @@
 #              HTML files and CGI.
 # processname: httpd
 # pidfile:     /var/run/httpd.pid
-# config:      /etc/httpd/conf/access.conf
-# config:      /etc/httpd/conf/httpd.conf
-# config:      /etc/httpd/conf/srm.conf
-
+# config:      /etc/httpd/apache.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -19,12 +16,11 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
+[ -f /etc/sysconfig/httpd ] && . /etc/sysconfig/httpd
 
 # Check that networking is up.
 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
                exit 1
        fi
@@ -33,14 +29,15 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-if   [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
-       CFG="-d ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
-elif [ -f "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
-       CFG="-f ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
-elif [ -n "$HTTPD_CONF" ]; then
-       echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
-       exit 1
-else CFG=""; fi
+
+if [ -n "${HTTPD_CONF}" ]; then
+       if [ -d "${HTTPD_CONF}" ] || [ -f "${HTTPD_CONF}" ]; then
+               CFG="-f ${HTTPD_CONF}"
+       else
+               echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
+               exit 1
+       fi
+fi
 
 RETVAL=0
 # See how we were called.
@@ -60,30 +57,8 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
-               if [ -f /var/run/httpd.pid ]; then
-                       PID=$(filter_chroot `cat /var/run/httpd.pid`)
-                       if [ -z "$PID" ]; then
-                               PID=0
-                       fi
-               else
-                       PID=0
-               fi
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k stop
-               RET=$?
-               # Wait for httpd to really stop
-               if [ ! $PID -eq 0 -a $RET -eq 0 ]; then
-                       show "Waiting for httpd to stop"
-                       busy
-                       while ps -o command $PID | grep -q ^httpd
-                       do
-                               sleep 1
-                       done
-                       ok
-               fi
-               # Delete pidfile only when apache was called successfully
-               if [ $RET -eq 0 ]; then
-                       rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
-               fi
+               killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
+               rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
                msg_not_running httpd.${HTTPD_MPM}
        fi
@@ -91,22 +66,42 @@ case "$1" in
   status)
        status httpd.${HTTPD_MPM}
        RETVAL=$?
-       /usr/sbin/httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -S
+       /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
        ;;
   restart)
-       $0 stop
+       $0 stop
        $0 start
        ;;
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k graceful
+               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       msg_reloading httpd.${HTTPD_MPM}
+                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       RETVAL=$?
+               fi
+       else
+               msg_not_running httpd.${HTTPD_MPM}
+               RETVAL=7
+       fi
+       ;;
+  force-reload)
+       if [ -f /var/lock/subsys/httpd ]; then
+               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
                RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       msg_reloading httpd.${HTTPD_MPM}
+                       # forced reload
+                       daemon httpd.${HTTPD_MPM} $CFG -k restart
+                       RETVAL=$?
+               fi
        else
-               msg_not_running httpd.${HTTPD_MPM} >&2
+               msg_not_running httpd.${HTTPD_MPM}
                RETVAL=7
        fi
        ;;
+
   *)
        msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
        exit 3