[Python-modules-commits] r29737 - in packages/fedmsg/tags (11 files)

olasd at users.alioth.debian.org olasd at users.alioth.debian.org
Sun Jul 13 08:36:29 UTC 2014


    Date: Sunday, July 13, 2014 @ 08:36:28
  Author: olasd
Revision: 29737

[svn-buildpackage] Tagging fedmsg 0.8.0-2

Added:
  packages/fedmsg/tags/0.8.0-2/
  packages/fedmsg/tags/0.8.0-2/debian/changelog
    (from rev 29736, packages/fedmsg/trunk/debian/changelog)
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-gateway.init)
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-hub.init)
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-irc.init)
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init
    (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-relay.init)
Deleted:
  packages/fedmsg/tags/0.8.0-2/debian/changelog
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init
  packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init

Deleted: packages/fedmsg/tags/0.8.0-2/debian/changelog
===================================================================
--- packages/fedmsg/trunk/debian/changelog	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.8.0-2/debian/changelog	2014-07-13 08:36:28 UTC (rev 29737)
@@ -1,61 +0,0 @@
-fedmsg (0.8.0-1) unstable; urgency=medium
-
-  * New upstream release
-    - Drop twitter-related workarounds as twitter was removed upstream
-  * Add GPG signature verification to debian/watch
-  * Update d/copyright
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 18:54:55 +0200
-
-fedmsg (0.7.7-1) unstable; urgency=medium
-
-  * New upstream release
-  * Update the fedmsg-tail manpage to match the upstream changes
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sun, 30 Mar 2014 20:03:33 +0200
-
-fedmsg (0.7.6-2) unstable; urgency=medium
-
-  * Add missing depends on adduser for the packages that add the fedmsg
-    user in postinst
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sat, 29 Mar 2014 08:07:30 +0100
-
-fedmsg (0.7.6-1) unstable; urgency=medium
-
-  * New upstream release (Closes: #738058)
-    - Refresh patches for new upstream release
-  * Switch buildsystem to pybuild
-  * Replace help2man'd manpages with hand-written ones (Closes: #733569)
-  * Bump Standards-Version to 3.9.5 (no changes)
-  * Introduce new binary packages fedmsg{,-gateway,-relay,-hub,-irc}
-  * Ship initscripts and systemd unit files for the daemons
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sun, 09 Mar 2014 03:04:56 +0100
-
-fedmsg (0.7.1-1) unstable; urgency=low
-
-  [ Simon Chopin ]
-  * New upstream release
-  * Run the tests at build time
-    + Added a patch to work around a missing symlink for the test certificates
-
-  [ Nicolas Dandrimont ]
-  * Add myself to uploaders
-  * Drop requirement on python-fabulous
-
- -- Nicolas Dandrimont <olasd at debian.org>  Sat, 05 Oct 2013 11:37:16 +0200
-
-fedmsg (0.6.8+git20130813.1.60346e0-2) unstable; urgency=low
-
-  * Team upload.
-  * Remove reference to the non-main Google web fonts, recommend the
-    Debian-packaged font instead.
-
- -- Nicolas Dandrimont <olasd at debian.org>  Tue, 13 Aug 2013 23:47:52 +0200
-
-fedmsg (0.6.8+git20130813.1.60346e0-1) unstable; urgency=low
-
-  * Initial release. (Closes: #705953)
-
- -- Simon Chopin <chopin.simon at gmail.com>  Tue, 13 Aug 2013 20:48:02 +0200

Copied: packages/fedmsg/tags/0.8.0-2/debian/changelog (from rev 29736, packages/fedmsg/trunk/debian/changelog)
===================================================================
--- packages/fedmsg/tags/0.8.0-2/debian/changelog	                        (rev 0)
+++ packages/fedmsg/tags/0.8.0-2/debian/changelog	2014-07-13 08:36:28 UTC (rev 29737)
@@ -0,0 +1,67 @@
+fedmsg (0.8.0-2) unstable; urgency=high
+
+  * Fix init scripts so that the daemons really get launched (Closes: #752895)
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 13 Jul 2014 10:30:13 +0200
+
+fedmsg (0.8.0-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop twitter-related workarounds as twitter was removed upstream
+  * Add GPG signature verification to debian/watch
+  * Update d/copyright
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 18:54:55 +0200
+
+fedmsg (0.7.7-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update the fedmsg-tail manpage to match the upstream changes
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 30 Mar 2014 20:03:33 +0200
+
+fedmsg (0.7.6-2) unstable; urgency=medium
+
+  * Add missing depends on adduser for the packages that add the fedmsg
+    user in postinst
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sat, 29 Mar 2014 08:07:30 +0100
+
+fedmsg (0.7.6-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #738058)
+    - Refresh patches for new upstream release
+  * Switch buildsystem to pybuild
+  * Replace help2man'd manpages with hand-written ones (Closes: #733569)
+  * Bump Standards-Version to 3.9.5 (no changes)
+  * Introduce new binary packages fedmsg{,-gateway,-relay,-hub,-irc}
+  * Ship initscripts and systemd unit files for the daemons
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 09 Mar 2014 03:04:56 +0100
+
+fedmsg (0.7.1-1) unstable; urgency=low
+
+  [ Simon Chopin ]
+  * New upstream release
+  * Run the tests at build time
+    + Added a patch to work around a missing symlink for the test certificates
+
+  [ Nicolas Dandrimont ]
+  * Add myself to uploaders
+  * Drop requirement on python-fabulous
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sat, 05 Oct 2013 11:37:16 +0200
+
+fedmsg (0.6.8+git20130813.1.60346e0-2) unstable; urgency=low
+
+  * Team upload.
+  * Remove reference to the non-main Google web fonts, recommend the
+    Debian-packaged font instead.
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Tue, 13 Aug 2013 23:47:52 +0200
+
+fedmsg (0.6.8+git20130813.1.60346e0-1) unstable; urgency=low
+
+  * Initial release. (Closes: #705953)
+
+ -- Simon Chopin <chopin.simon at gmail.com>  Tue, 13 Aug 2013 20:48:02 +0200

Deleted: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-gateway.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-gateway
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg gateway daemon
-# Description:       Gateway daemon for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="gateway daemon for the fedmsg bus"
-NAME=fedmsg-gateway
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-gateway.init)
===================================================================
--- packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init	                        (rev 0)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-gateway.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-gateway
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg gateway daemon
+# Description:       Gateway daemon for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="gateway daemon for the fedmsg bus"
+NAME=fedmsg-gateway
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-hub.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-hub
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg producer/consumer hub daemon
-# Description:       Producer/consumer hub daemon for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="producer/consumer hub daemon for the fedmsg bus"
-NAME=fedmsg-hub
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-hub.init)
===================================================================
--- packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init	                        (rev 0)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-hub.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-hub
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg producer/consumer hub daemon
+# Description:       Producer/consumer hub daemon for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="producer/consumer hub daemon for the fedmsg bus"
+NAME=fedmsg-hub
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-irc.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-irc
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg IRC bot
-# Description:       IRC bot for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="IRC bot for the fedmsg bus"
-NAME=fedmsg-irc
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-irc.init)
===================================================================
--- packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init	                        (rev 0)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-irc.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-irc
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg IRC bot
+# Description:       IRC bot for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="IRC bot for the fedmsg bus"
+NAME=fedmsg-irc
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Deleted: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-relay.init	2014-07-13 02:44:20 UTC (rev 29734)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          fedmsg-relay
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: fedmsg relay daemon
-# Description:       Relay daemon for the fedmsg bus
-### END INIT INFO
-
-# Author: Nicolas Dandrimont <olasd at debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="relay daemon for the fedmsg bus"
-NAME=fedmsg-relay
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=fedmsg
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --user $USER --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	start-stop-daemon --stop --quiet --user $USER --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  restart|force-reload)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Copied: packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init (from rev 29735, packages/fedmsg/trunk/debian/fedmsg-relay.init)
===================================================================
--- packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init	                        (rev 0)
+++ packages/fedmsg/tags/0.8.0-2/debian/fedmsg-relay.init	2014-07-13 08:36:28 UTC (rev 29737)
@@ -0,0 +1,101 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          fedmsg-relay
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: fedmsg relay daemon
+# Description:       Relay daemon for the fedmsg bus
+### END INIT INFO
+
+# Author: Nicolas Dandrimont <olasd at debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="relay daemon for the fedmsg bus"
+NAME=fedmsg-relay
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/fedmsg/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=fedmsg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+do_start()
+{
+        if ! [ -d /var/run/fedmsg ]; then
+                mkdir /var/run/fedmsg
+                chown $USER /var/run/fedmsg
+        fi
+
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --user $USER --pidfile $PIDFILE --chuid $USER --background --startas /bin/sh -- -c "( $DAEMON 2>&1 & echo \$! > $PIDFILE ) | logger -p daemon.info -t $NAME &" \
+		|| return 2
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --user $USER --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	start-stop-daemon --stop --retry=0/30/KILL/5 --oknodo --quiet --user $USER --pidfile $PIDFILE
+	[ "$?" = 2 ] && return 2
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	;;
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+		# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:




More information about the Python-modules-commits mailing list