extras-buildsys/etc plague-builder.config, 1.7, 1.8 plague-builder.init, 1.14, 1.15 plague-server.config, 1.4, 1.5 plague-server.init, 1.9, 1.10

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24502/etc

Modified Files:
	plague-builder.config plague-builder.init plague-server.config 
	plague-server.init 
Log Message:



Index: plague-builder.config
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plague-builder.config	15 Nov 2007 16:34:31 -0000	1.7
+++ plague-builder.config	9 Jan 2008 02:06:30 -0000	1.8
@@ -1,2 +1,3 @@
 CONFIG="/etc/plague/builder/plague-builder.cfg"
-OPTIONS="-l /var/log/plague-builder.log -p /var/run/plague-builder.pid"
+PIDFILE="/var/run/plague-builder.pid"
+OPTIONS="-l /var/log/plague-builder.log"


Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plague-builder.init	7 Jan 2008 13:17:12 -0000	1.14
+++ plague-builder.init	9 Jan 2008 02:06:30 -0000	1.15
@@ -30,7 +30,7 @@
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --check $prog $exec -d -c $CONFIG $OPTIONS
+    daemon --check $prog $exec -d -c $CONFIG -p $PIDFILE $OPTIONS
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -39,7 +39,7 @@
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc -d 5 $prog
+    killproc -p $PIDFILE -d 5 $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile


Index: plague-server.config
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plague-server.config	15 Nov 2007 16:34:31 -0000	1.4
+++ plague-server.config	9 Jan 2008 02:06:30 -0000	1.5
@@ -1,2 +1,3 @@
 CONFIG="/etc/plague/server/plague-server.cfg"
-OPTIONS="-l /var/log/plague-server.log -p /var/run/plague-server.pid"
+PIDFILE="/var/run/plague-server.pid"
+OPTIONS="-l /var/log/plague-server.log"


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plague-server.init	7 Jan 2008 13:17:12 -0000	1.9
+++ plague-server.init	9 Jan 2008 02:06:30 -0000	1.10
@@ -31,7 +31,7 @@
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --check $prog $exec -d -c $CONFIG $OPTIONS
+    daemon --check $prog $exec -d -c $CONFIG -p $PIDFILE $OPTIONS
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -40,7 +40,7 @@
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc -d 5 $prog
+    killproc -p $PIDFILE -d 5 $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile