Author: glen Date: Mon Oct 13 15:07:09 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- --pidfile and full path to daemon executable
---- Files affected:
SOURCES:
apache1.init (1.27 -> 1.28)
---- Diffs:
================================================================
Index: SOURCES/apache1.init
diff -u SOURCES/apache1.init:1.27 SOURCES/apache1.init:1.28
--- SOURCES/apache1.init:1.27 Wed Feb 13 10:31:40 2008
+++ SOURCES/apache1.init Mon Oct 13 17:07:03 2008
@@ -34,7 +34,7 @@
fi
configtest() {
- apache -t > /dev/null 2>&1
+ /usr/sbin/apache -t > /dev/null 2>&1
RETVAL=$?
}
@@ -52,7 +52,7 @@
fi
if [ ! -f /var/lock/subsys/apache ]; then
msg_starting apache
- daemon apache $HTTPD_OPTS
+ daemon /usr/sbin/apache $HTTPD_OPTS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
else
@@ -64,7 +64,7 @@
# Stop daemons.
if [ -f /var/lock/subsys/apache ]; then
msg_stopping apache
- killproc apache
+ killproc --pidfile /var/run/apache.pid apache
rm -f /var/lock/subsys/apache /var/run/apache.pid
/var/run/apache.loc* >/dev/null 2>&1
else
msg_not_running apache
@@ -99,7 +99,7 @@
configtest
if [ $RETVAL -eq 0 ]; then
- killproc apache -$sig
+ killproc --pidfile /var/run/apache.pid apache -$sig
RETVAL=$?
else
fail
@@ -145,7 +145,7 @@
reload USR1 0
;;
configtest)
- apache -t
+ /usr/sbin/apache -t
;;
*)
msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache1.init?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
