[Box Backup-commit] COMMIT r2191 - box/trunk/contrib/debian

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2008-06-15 20:08:30 +0100 (Sun, 15 Jun 2008)
New Revision: 2191

Modified:
   box/trunk/contrib/debian/bbackupd.in
   box/trunk/contrib/debian/bbstored.in
Log:
Fix default locations of PID files.

Wait for daemons to stop before starting them again during restart.


Modified: box/trunk/contrib/debian/bbackupd.in
===================================================================
--- box/trunk/contrib/debian/bbackupd.in	2008-05-29 21:51:38 UTC (rev 2190)
+++ box/trunk/contrib/debian/bbackupd.in	2008-06-15 19:08:30 UTC (rev 2191)
@@ -4,7 +4,7 @@
 
 BBACKUPD=@sbindir_expanded@/bbackupd
 CONFIG=@sysconfdir_expanded@/box/bbackupd.conf
-PIDFILE=@localstatedir_expanded@/bbackupd.pid
+PIDFILE=@localstatedir_expanded@/bbackupd/bbackupd.pid
 
 test -x $BBACKUPD || exit 0
 test -f $CONFIG || exit 0
@@ -33,7 +33,7 @@
 	restart)
 		echo -n "Restarting Box Backup Client daemon: bbackupd"	
 		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec $BBACKUPD
+			--exec $BBACKUPD --retry 5
 		start-stop-daemon --start --quiet \
 			--exec $BBACKUPD > /dev/null
 		echo "."

Modified: box/trunk/contrib/debian/bbstored.in
===================================================================
--- box/trunk/contrib/debian/bbstored.in	2008-05-29 21:51:38 UTC (rev 2190)
+++ box/trunk/contrib/debian/bbstored.in	2008-06-15 19:08:30 UTC (rev 2191)
@@ -4,7 +4,7 @@
 
 BBSTORED=@sbindir_expanded@/bbstored
 CONFIG=@sysconfdir_expanded@/box/bbstored.conf
-PIDFILE=@localstatedir_expanded@/bbstored.pid
+PIDFILE=@localstatedir_expanded@/run/bbstored.pid
 
 test -x $BBACKUPD || exit 0
 test -f $CONFIG || exit 0
@@ -33,7 +33,7 @@
 	restart)
 		echo -n "Restarting Box Backup Server daemon: bbstored"
 		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec $BBSTORED
+			--exec $BBSTORED --retry 5
 		start-stop-daemon --start --quiet \
 			--exec $BBSTORED > /dev/null
 		echo "."