# Check that networking is up.
if is_yes "${NETWORKING}"; then
- if [ ! -f /var/lock/subsys/network ]; 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
exit 0
fi
+[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
+
+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
+ msg_starting httpd.${HTTPD_MPM}
+ daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf $HTTPD_OPTS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
else
- msg_already_running httpd
- exit 1
+ msg_already_running httpd.${HTTPD_MPM}
fi
;;
stop)
# Stop daemons.
if [ -f /var/lock/subsys/httpd ]; then
- msg_stopping httpd
- killproc httpd
+ msg_stopping httpd.${HTTPD_MPM}
+ if [ -f /var/run/httpd.pid ]; then
+ PID=`cat /var/run/httpd.pid`
+ else
+ PID=0
+ fi
+ daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k stop
+ # Wait for httpd to really stop
+ if [ ! $PID -eq 0 ]; then
+ show "Waiting for httpd to stop"
+ busy
+ while ps ax | grep $PID.\*httpd > /dev/null
+ do
+ sleep 1
+ done
+ ok
+ fi
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
+ msg_not_running httpd.${HTTPD_MPM}
fi
;;
status)
- status httpd
- /usr/sbin/httpd -S
- exit $?
+ status httpd.${HTTPD_MPM}
+ RETVAL=$?
+ /usr/sbin/httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -S
;;
restart)
- $0 stop
+ $0 stop
$0 start
;;
- reload)
- msg_reloading httpd
- busy
- killproc httpd -HUP
- RETVAL=$?
- [ $RETVAL -eq 0 ] && ok || died
+ 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
+ RETVAL=$?
+ else
+ msg_not_running httpd.${HTTPD_MPM} >&2
+ RETVAL=7
+ fi
;;
*)
- msg_usage "$0 {start|stop|restart|reload|status}"
- exit 1
+ msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+ exit 3
;;
esac