# 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
fi
[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-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"
- exit 1
-else
- CFG=""
+
+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
# Stop daemons.
if [ -f /var/lock/subsys/httpd ]; then
msg_stopping httpd.${HTTPD_MPM}
- [ -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 [ $? -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
RETVAL=$?
fi
else
- msg_not_running httpd.${HTTPD_MPM} >&2
+ 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}
+ RETVAL=7
+ fi
+ ;;
+
*)
msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
exit 3