[Python-modules-commits] r28063 - in packages/fedmsg/trunk/debian (19 files)

olasd at users.alioth.debian.org olasd at users.alioth.debian.org
Sun Mar 9 00:09:46 UTC 2014


    Date: Sunday, March 9, 2014 @ 00:09:45
  Author: olasd
Revision: 28063

Split fedmsg-python in separate binary packages, with initscripts/systemd units

Added:
  packages/fedmsg/trunk/debian/fedmsg-gateway.init
  packages/fedmsg/trunk/debian/fedmsg-gateway.install
  packages/fedmsg/trunk/debian/fedmsg-gateway.manpages
  packages/fedmsg/trunk/debian/fedmsg-gateway.service
  packages/fedmsg/trunk/debian/fedmsg-hub.init
  packages/fedmsg/trunk/debian/fedmsg-hub.install
  packages/fedmsg/trunk/debian/fedmsg-hub.manpages
  packages/fedmsg/trunk/debian/fedmsg-hub.service
  packages/fedmsg/trunk/debian/fedmsg-irc.init
  packages/fedmsg/trunk/debian/fedmsg-irc.install
  packages/fedmsg/trunk/debian/fedmsg-irc.manpages
  packages/fedmsg/trunk/debian/fedmsg-irc.service
  packages/fedmsg/trunk/debian/fedmsg-relay.init
  packages/fedmsg/trunk/debian/fedmsg-relay.install
  packages/fedmsg/trunk/debian/fedmsg-relay.manpages
  packages/fedmsg/trunk/debian/fedmsg-relay.service
Modified:
  packages/fedmsg/trunk/debian/control
  packages/fedmsg/trunk/debian/python-fedmsg.install
  packages/fedmsg/trunk/debian/rules

Modified: packages/fedmsg/trunk/debian/control
===================================================================
--- packages/fedmsg/trunk/debian/control	2014-03-09 00:08:03 UTC (rev 28062)
+++ packages/fedmsg/trunk/debian/control	2014-03-09 00:09:45 UTC (rev 28063)
@@ -6,6 +6,7 @@
            Nicolas Dandrimont <olasd at debian.org>
 Build-Depends: debhelper (>= 9),
                dh-python,
+               dh-systemd,
                python-all (>= 2.6.6-3~),
                python-cloud-sptheme,
                python-fedmsg-meta-debian,
@@ -41,6 +42,9 @@
  fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
  infrastructure to send and receive messages to and from applications in order
  to allow for asynchronous processes.
+ .
+ This package provides the fedmsg Python module, allowing native integration
+ of fedmsg functionality in Python applications.
 
 Package: python-fedmsg-doc
 Section: doc
@@ -53,4 +57,66 @@
  infrastructure to send and receive messages to and from applications in order
  to allow for asynchronous processes.
  .
- This package provides the documentation for the API.
+ This package provides the documentation for the fedmsg Python package.
+
+Package: fedmsg-hub
+Architecture: all
+Depends: python-fedmsg (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Fedora messaging infrastructure system - receiving hub daemon
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-hub daemon, that provides a pluggable
+ infrastructure for listening to the fedmsg bus on a system.
+
+Package: fedmsg-relay
+Architecture: all
+Depends: python-fedmsg (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Fedora messaging infrastructure system - sender relay daemon
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-relay daemon, that provides a single,
+ persistent output endpoint for messages sent to the bus by ephemeral
+ processes on a system.
+
+Package: fedmsg-gateway
+Architecture: all
+Depends: python-fedmsg (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Fedora messaging infrastructure system - gateway daemon
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-gateway daemon, that aggregates and
+ broadcasts the messages received from several incoming endpoints on a
+ single outgoing endpoint.
+
+Package: fedmsg-irc
+Architecture: all
+Depends: python-fedmsg (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Fedora messaging infrastructure system - IRC bot
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the fedmsg-irc bot, that sends messages received
+ on the bus to an IRC channel.
+
+Package: fedmsg
+Architecture: all
+Depends: python-fedmsg (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Fedora messaging infrastructure system - general utilities
+ fedmsg (Fedora Messaging) is a Python package and API used within the Fedora
+ infrastructure to send and receive messages to and from applications in order
+ to allow for asynchronous processes.
+ .
+ This package contains the following utilities:
+  - fedmsg-announce: send an announcement to the fedmsg bus
+  - fedmsg-collectd: a collectd plugin feeding off fedmsg messages
+  - fedmsg-config: aggregate and dump the fedmsg config to stdout
+  - fedmsg-logger: send a message to the fedmsg bus from the command-line
+  - fedmsg-tail: read messages on the fedmsg bus from the command-line
+  - fedmsg-trigger: trigger a command on receiving an event on the fedmsg bus

Added: packages/fedmsg/trunk/debian/fedmsg-gateway.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-gateway.init	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-gateway.init	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,96 @@
+#! /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
+
+:

Added: packages/fedmsg/trunk/debian/fedmsg-gateway.install
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-gateway.install	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-gateway.install	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,2 @@
+etc/fedmsg.d/gateway.py
+usr/bin/fedmsg-gateway

Added: packages/fedmsg/trunk/debian/fedmsg-gateway.manpages
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-gateway.manpages	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-gateway.manpages	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1 @@
+debian/manpages/fedmsg-gateway.1

Added: packages/fedmsg/trunk/debian/fedmsg-gateway.service
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-gateway.service	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-gateway.service	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Outbound fedmsg gateway
+After=network.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-gateway
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target

Added: packages/fedmsg/trunk/debian/fedmsg-hub.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-hub.init	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-hub.init	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,96 @@
+#! /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
+
+:

Added: packages/fedmsg/trunk/debian/fedmsg-hub.install
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-hub.install	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-hub.install	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1 @@
+usr/bin/fedmsg-hub

Added: packages/fedmsg/trunk/debian/fedmsg-hub.manpages
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-hub.manpages	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-hub.manpages	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1 @@
+debian/manpages/fedmsg-hub.1

Added: packages/fedmsg/trunk/debian/fedmsg-hub.service
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-hub.service	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-hub.service	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Generic fedmsg processing hub
+After=network.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-hub
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target

Added: packages/fedmsg/trunk/debian/fedmsg-irc.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-irc.init	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-irc.init	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,96 @@
+#! /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
+
+:

Added: packages/fedmsg/trunk/debian/fedmsg-irc.install
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-irc.install	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-irc.install	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,2 @@
+etc/fedmsg.d/ircbot.py
+usr/bin/fedmsg-irc

Added: packages/fedmsg/trunk/debian/fedmsg-irc.manpages
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-irc.manpages	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-irc.manpages	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1 @@
+debian/manpages/fedmsg-irc.1

Added: packages/fedmsg/trunk/debian/fedmsg-irc.service
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-irc.service	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-irc.service	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,13 @@
+[Unit]
+Description=IRC bot for fedmsg
+After=network.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-irc
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target

Added: packages/fedmsg/trunk/debian/fedmsg-relay.init
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-relay.init	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-relay.init	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,96 @@
+#! /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
+
+:

Added: packages/fedmsg/trunk/debian/fedmsg-relay.install
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-relay.install	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-relay.install	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,2 @@
+etc/fedmsg.d/relay.py
+usr/bin/fedmsg-relay

Added: packages/fedmsg/trunk/debian/fedmsg-relay.manpages
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-relay.manpages	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-relay.manpages	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1 @@
+debian/manpages/fedmsg-relay.1

Added: packages/fedmsg/trunk/debian/fedmsg-relay.service
===================================================================
--- packages/fedmsg/trunk/debian/fedmsg-relay.service	                        (rev 0)
+++ packages/fedmsg/trunk/debian/fedmsg-relay.service	2014-03-09 00:09:45 UTC (rev 28063)
@@ -0,0 +1,13 @@
+[Unit]
+Description=fedmsg active<->passive relay
+After=network.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-relay
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target

Modified: packages/fedmsg/trunk/debian/python-fedmsg.install
===================================================================
--- packages/fedmsg/trunk/debian/python-fedmsg.install	2014-03-09 00:08:03 UTC (rev 28062)
+++ packages/fedmsg/trunk/debian/python-fedmsg.install	2014-03-09 00:09:45 UTC (rev 28063)
@@ -1,4 +1,2 @@
-etc/
-usr/bin/
 usr/lib/
 usr/share/fedmsg/

Modified: packages/fedmsg/trunk/debian/rules
===================================================================
--- packages/fedmsg/trunk/debian/rules	2014-03-09 00:08:03 UTC (rev 28062)
+++ packages/fedmsg/trunk/debian/rules	2014-03-09 00:09:45 UTC (rev 28063)
@@ -3,7 +3,7 @@
 UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
 
 %:
-	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python2,sphinxdoc,systemd --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
@@ -11,12 +11,20 @@
 
 override_dh_auto_install:
 	dh_auto_install
+
+	# Grab the fedmsg config
 	mkdir -p debian/tmp/etc/
 	cp -r fedmsg.d debian/tmp/etc/
+
+	# Install the extras
 	mkdir -p debian/tmp/usr/share/fedmsg/
-	cp -r extras initsys debian/tmp/usr/share/fedmsg
-	chmod +x debian/tmp/usr/share/fedmsg/initsys/sysv/*
+	cp -r extras debian/tmp/usr/share/fedmsg
+
+	# useless SOURCES.txt files
 	rm debian/tmp/usr/lib/python2*/dist-packages/fedmsg*.egg-info/SOURCES.txt
+	
+	# twitter stuff
+	rm debian/tmp/etc/fedmsg.d/tweet.py
 
 override_dh_install:
 	dh_install --fail-missing




More information about the Python-modules-commits mailing list