Author: glen Date: Tue Oct 14 16:00:22 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add configtest target, consistency
---- Files affected:
SOURCES:
apache.init (1.60 -> 1.61)
---- Diffs:
================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.60 SOURCES/apache.init:1.61
--- SOURCES/apache.init:1.60 Mon Oct 13 14:37:40 2008
+++ SOURCES/apache.init Tue Oct 14 18:00:17 2008
@@ -39,6 +39,10 @@
fi
fi
+configtest() {
+ /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS >/dev/null 2>&1
+}
+
start() {
# Check if the service is already running?
if [ ! -f /var/lock/subsys/httpd ]; then
@@ -84,7 +88,7 @@
status)
status httpd.${HTTPD_MPM}
RETVAL=$?
- /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
+ /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -S
;;
restart)
stop
@@ -95,12 +99,12 @@
;;
reload|force-reload|graceful)
if [ -f /var/lock/subsys/httpd ]; then
- run_cmd "Checking httpd.${HTTPD_MPM} configuration"
/usr/sbin/httpd.${HTTPD_MPM} $CFG -t
+ configtest
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
msg_reloading httpd.${HTTPD_MPM}
busy
- /usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
+ /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -k
graceful
RETVAL=$?
[ $RETVAL -eq 0 ] && ok || fail
fi
@@ -113,7 +117,7 @@
if [ -f /var/lock/subsys/httpd ]; then
msg_reloading httpd.${HTTPD_MPM}
- /usr/sbin/httpd.${HTTPD_MPM} -t >/dev/null 2>&1
+ configtest
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
/usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
@@ -125,8 +129,11 @@
fi
fi
;;
+ configtest)
+ /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS
+ ;;
*)
- msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|graceful|status}"
+ msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"
exit 3
;;
esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache.init?r1=1.60&r2=1.61&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
