. /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
fi
[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-if [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
+if [ -d "${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"
# Stop daemons.
if [ -f /var/lock/subsys/httpd ]; then
msg_stopping httpd.${HTTPD_MPM}
- daemon --waitforname httpd.${HTTPD_MPM} --waitfortime 60 httpd.${HTTPD_MPM} $CFG -k stop
- RETVAL=$?
+ [ -n "$(pidofproc httpd.${HTTPD_MPM})" ] && OPT="--waitforname httpd.${HTTPD_MPM} --waitfortime 60" || OPT=
+ daemon $OPT httpd.${HTTPD_MPM} $CFG -k stop
# Delete pidfile only when apache was called successfully
- if [ $RETVAL -eq 0 ]; then
+ if [ $? -eq 0 ]; then
rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
fi
else
;;
reload|force-reload|graceful)
if [ -f /var/lock/subsys/httpd ]; then
- msg_reloading httpd.${HTTPD_MPM}
- httpd.${HTTPD_MPM} $CFG -t > /dev/null 2>&1
+ run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
- daemon httpd.${HTTPD_MPM} $CFG -k graceful
- else
- fail
- echo "Configuration file syntax test failed."
+ msg_reloading httpd.${HTTPD_MPM}
+ daemon httpd.${HTTPD_MPM} $CFG -k graceful
+ RETVAL=$?
fi
else
msg_not_running httpd.${HTTPD_MPM} >&2