[Python-apps-commits] r7999 - in packages/trac-bitten/trunk/debian (11 files)
debacle at users.alioth.debian.org
debacle at users.alioth.debian.org
Thu Dec 29 09:34:54 UTC 2011
Date: Thursday, December 29, 2011 @ 09:34:53
Author: debacle
Revision: 7999
Prepare new package upload.
Added:
packages/trac-bitten/trunk/debian/examples/
packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.default
(from rev 7707, packages/trac-bitten/trunk/debian/trac-bitten-slave.default)
packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.init
(from rev 7707, packages/trac-bitten/trunk/debian/trac-bitten-slave.init)
packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.upstart
(from rev 7707, packages/trac-bitten/trunk/debian/trac-bitten-slave.upstart)
Modified:
packages/trac-bitten/trunk/debian/changelog
packages/trac-bitten/trunk/debian/control
packages/trac-bitten/trunk/debian/source/format
packages/trac-bitten/trunk/debian/trac-bitten-slave.install
Deleted:
packages/trac-bitten/trunk/debian/trac-bitten-slave.default
packages/trac-bitten/trunk/debian/trac-bitten-slave.init
packages/trac-bitten/trunk/debian/trac-bitten-slave.upstart
Modified: packages/trac-bitten/trunk/debian/changelog
===================================================================
--- packages/trac-bitten/trunk/debian/changelog 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/changelog 2011-12-29 09:34:53 UTC (rev 7999)
@@ -1,19 +1,15 @@
-trac-bitten (0.6+final-1) UNRELEASED; urgency=low
-
- * TODO: add user "trac-bitten-slave" in postinst, a bitten slave without
- dedicated user does not make much sense
-
+trac-bitten (0.6+final-1) unstable; urgency=low
* New upstream version (Closes: #633918).
* Bump standards to 3.9.2. No changes.
* Make separate packages for master and slave (Closes: #575127).
- * Add init script for slave (Closes: #595153).
+ * Add init and upstart scripts for slave,
+ but only as example for the moment (Closes: #595153).
* Get rid of python-support. Use dh instead of CDBS.
[ anatoly techtonik <techtonik at gmail.com> ]
* New upstream version.
* Dropped dfsg version prefix as there are no non-free SWF files anymore.
* debian/control:
- - Bump standards to 3.8.4.
- Build-Depends on python-all instead of python-dev-all
(fixes lintian build-depends-on-python-dev-with-no-arch-any)
- Remove deprecated X[SB]-Python-Version
Modified: packages/trac-bitten/trunk/debian/control
===================================================================
--- packages/trac-bitten/trunk/debian/control 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/control 2011-12-29 09:34:53 UTC (rev 7999)
@@ -22,7 +22,7 @@
Bitten is similar to BuildBot, Gump, Hudson, Jenkins, or
Tinderbox, but integrated well into Trac.
.
- This package contains the master implemented as Trac plugin.
+ This package contains the master, implemented as Trac plugin.
Package: trac-bitten-slave
Architecture: all
@@ -37,3 +37,5 @@
Tinderbox, but integrated well into Trac.
.
This package contains the slave, which performs the actual build.
+ It is recommended to run the slave on behalf of a non-privileged
+ user. You may run the slave from e.g. from cron or as a daemon.
Copied: packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.default (from rev 7707, packages/trac-bitten/trunk/debian/trac-bitten-slave.default)
===================================================================
--- packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.default (rev 0)
+++ packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.default 2011-12-29 09:34:53 UTC (rev 7999)
@@ -0,0 +1,13 @@
+# -*- sh -*-
+# Don't start the daemon by default.
+# To run it, set the URLs parameter to one or more URLs.
+
+# Alternatively, one can run the bitten-slave from crond or from an
+# SVN post-commit hook.
+
+# Run `/usr/bin/bitten-slave --help' for further options.
+DAEMON_ARGS="--config=/etc/bitten/slave.ini --interval=15"
+
+# Set one or more space separated URLs (with double quotes), such as
+# "https://trac.srv1.org/prj1/builds https://trac.srv2.org/prj2/builds"
+URLS=""
Copied: packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.init (from rev 7707, packages/trac-bitten/trunk/debian/trac-bitten-slave.init)
===================================================================
--- packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.init (rev 0)
+++ packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.init 2011-12-29 09:34:53 UTC (rev 7999)
@@ -0,0 +1,100 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: bitten-slave
+# required-start: $all
+# required-stop: $all
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: starts trac's bitten-slave
+# Description: starts trac's bitten-slave using start-stop-daemon
+### END INIT INFO
+
+# this script is a modified version of
+# http://bitten.edgewall.org/wiki/BittenSlaveDaemonUbuntu
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Trac Bitten Slave"
+NAME=trac-bitten-slave
+DAEMON=/usr/bin/bitten-slave
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=trac-bitten-slave
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ -n "$URLS" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ start-stop-daemon --start --quiet --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" -- $DAEMON_ARGS $URLS
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --retry 5
+ RETVAL="$?"
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ 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|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
Copied: packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.upstart (from rev 7707, packages/trac-bitten/trunk/debian/trac-bitten-slave.upstart)
===================================================================
--- packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.upstart (rev 0)
+++ packages/trac-bitten/trunk/debian/examples/trac-bitten-slave.upstart 2011-12-29 09:34:53 UTC (rev 7999)
@@ -0,0 +1,16 @@
+description "Trac Bitten Slave"
+author "debacle at debian.org"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [!2345]
+
+script
+ . /etc/default/trac-bitten-slave
+ [ -n "$URLS" ] || exit 0
+ exec sudo -u trac-bitten-slave /usr/bin/bitten-slave $DAEMON_ARGS $URLS
+end script
+
+respawn
+
+## print all output to console (for debugging)
+#console output
Modified: packages/trac-bitten/trunk/debian/source/format
===================================================================
--- packages/trac-bitten/trunk/debian/source/format 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/source/format 2011-12-29 09:34:53 UTC (rev 7999)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Deleted: packages/trac-bitten/trunk/debian/trac-bitten-slave.default
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.default 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.default 2011-12-29 09:34:53 UTC (rev 7999)
@@ -1,13 +0,0 @@
-# -*- sh -*-
-# Don't start the daemon by default.
-# To run it, set the URLs parameter to one or more URLs.
-
-# Alternatively, one can run the bitten-slave from crond or from an
-# SVN post-commit hook.
-
-# Run `/usr/bin/bitten-slave --help' for further options.
-DAEMON_ARGS="--config=/etc/bitten/slave.ini --interval=15"
-
-# Set one or more space separated URLs (with double quotes), such as
-# "https://trac.myserver.com/myproject/builds https://trac.myserver.com/herproject/builds"
-URLS=""
Deleted: packages/trac-bitten/trunk/debian/trac-bitten-slave.init
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.init 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.init 2011-12-29 09:34:53 UTC (rev 7999)
@@ -1,100 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: bitten-slave
-# required-start: $all
-# required-stop: $all
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: starts trac's bitten-slave
-# Description: starts trac's bitten-slave using start-stop-daemon
-### END INIT INFO
-
-# this script is a modified version of
-# http://bitten.edgewall.org/wiki/BittenSlaveDaemonUbuntu
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Trac Bitten Slave"
-NAME=trac-bitten-slave
-DAEMON=/usr/bin/bitten-slave
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-USER=trac-bitten-slave
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-[ -n "$URLS" ] || exit 0
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- start-stop-daemon --start --quiet --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" -- $DAEMON_ARGS $URLS
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- start-stop-daemon --stop --quiet --pidfile $PIDFILE --oknodo --retry 5
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- 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|restart|force-reload}" >&2
- exit 3
- ;;
-esac
Modified: packages/trac-bitten/trunk/debian/trac-bitten-slave.install
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.install 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.install 2011-12-29 09:34:53 UTC (rev 7999)
@@ -4,3 +4,4 @@
bitten/util/ usr/share/pyshared/bitten/
bitten/{__init__,recipe,slave}.py usr/share/pyshared/bitten/
usr/bin/bitten-slave /usr/bin/
+debian/examples/ usr/share/doc/trac-bitten-slave/
\ No newline at end of file
Deleted: packages/trac-bitten/trunk/debian/trac-bitten-slave.upstart
===================================================================
--- packages/trac-bitten/trunk/debian/trac-bitten-slave.upstart 2011-12-29 00:38:13 UTC (rev 7998)
+++ packages/trac-bitten/trunk/debian/trac-bitten-slave.upstart 2011-12-29 09:34:53 UTC (rev 7999)
@@ -1,16 +0,0 @@
-description "Trac Bitten Slave"
-author "debacle at debian.org"
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-script
- . /etc/default/trac-bitten-slave
- [ -n "$URLS" ] || exit 0
- exec sudo -u trac-bitten-slave /usr/bin/bitten-slave $DAEMON_ARGS $URLS
-end script
-
-respawn
-
-## print all output to console (for debugging)
-#console output
More information about the Python-apps-commits
mailing list