packages: haproxy/haproxy.init, nginx/nginx-mail.init, nginx/nginx-perl.ini...

[zbyniu]

Author: zbyniu                       Date: Fri May  1 01:09:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- full path in daemon()

---- Files affected:
packages/haproxy:
   haproxy.init (1.3 -> 1.4) 
packages/nginx:
   nginx-mail.init (1.1 -> 1.2) , nginx-perl.init (1.1 -> 1.2) , nginx-standard.init (1.1 -> 1.2) , nginx.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/haproxy/haproxy.init
diff -u packages/haproxy/haproxy.init:1.3 packages/haproxy/haproxy.init:1.4
--- packages/haproxy/haproxy.init:1.3	Tue Apr 17 19:51:08 2007
+++ packages/haproxy/haproxy.init	Fri May  1 03:09:00 2009
@@ -37,7 +37,7 @@
 start() {
 	if [ ! -f /var/lock/subsys/haproxy ]; then
 		msg_starting haproxy
-		daemon haproxy -D -f /etc/haproxy/haproxy.cfg -p /var/run/haproxy.pid
+		daemon /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg -p /var/run/haproxy.pid
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/haproxy
 	else
@@ -73,7 +73,7 @@
 	if [ -f /var/lock/subsys/haproxy ]; then
 		checkconfig
 		msg_reloading haproxy
-		daemon haproxy -f /etc/haproxy/haproxy.cfg -p /var/run/haproxy.pid -st $(</var/run/haproxy.pid)
+		daemon /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -p /var/run/haproxy.pid -st $(</var/run/haproxy.pid)
 		RETVAL=$?
 	else
 		msg_not_running haproxy

================================================================
Index: packages/nginx/nginx-mail.init
diff -u packages/nginx/nginx-mail.init:1.1 packages/nginx/nginx-mail.init:1.2
--- packages/nginx/nginx-mail.init:1.1	Fri Nov 30 20:00:19 2007
+++ packages/nginx/nginx-mail.init	Fri May  1 03:09:01 2009
@@ -42,7 +42,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nginx-mail ]; then
 		msg_starting nginx-mail
-		daemon nginx-mail $CFG $HTTPD_OPTS
+		daemon /usr/sbin/nginx-mail $CFG $HTTPD_OPTS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-mail
 	else

================================================================
Index: packages/nginx/nginx-perl.init
diff -u packages/nginx/nginx-perl.init:1.1 packages/nginx/nginx-perl.init:1.2
--- packages/nginx/nginx-perl.init:1.1	Fri Nov 30 20:00:19 2007
+++ packages/nginx/nginx-perl.init	Fri May  1 03:09:01 2009
@@ -42,7 +42,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nginx-perl ]; then
 		msg_starting nginx-perl
-		daemon nginx-perl $CFG $HTTPD_OPTS
+		daemon /usr/sbin/nginx-perl $CFG $HTTPD_OPTS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-perl
 	else

================================================================
Index: packages/nginx/nginx-standard.init
diff -u packages/nginx/nginx-standard.init:1.1 packages/nginx/nginx-standard.init:1.2
--- packages/nginx/nginx-standard.init:1.1	Fri Nov 30 19:24:08 2007
+++ packages/nginx/nginx-standard.init	Fri May  1 03:09:01 2009
@@ -42,7 +42,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nginx-standard ]; then
 		msg_starting nginx-standard
-		daemon nginx-standard $CFG $HTTPD_OPTS
+		daemon /usr/sbin/nginx-standard $CFG $HTTPD_OPTS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx-standard
 	else

================================================================
Index: packages/nginx/nginx.init
diff -u packages/nginx/nginx.init:1.3 packages/nginx/nginx.init:1.4
--- packages/nginx/nginx.init:1.3	Sun Feb 25 16:15:02 2007
+++ packages/nginx/nginx.init	Fri May  1 03:09:01 2009
@@ -42,7 +42,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nginx ]; then
 		msg_starting nginx
-		daemon nginx $CFG $HTTPD_OPTS
+		daemon /usr/sbin/nginx $CFG $HTTPD_OPTS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nginx
 	else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/haproxy/haproxy.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nginx/nginx-mail.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nginx/nginx-perl.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nginx/nginx-standard.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nginx/nginx.init?r1=1.3&r2=1.4&f=u