[Python-modules-commits] r23367 - in packages/celery/branches/wheezy/debian (6 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Mon Jan 21 08:31:34 UTC 2013
Date: Monday, January 21, 2013 @ 08:31:32
Author: fladi-guest
Revision: 23367
Undo changes to init-scripts and default files to minimize debdiff for freeze exception.
Modified:
packages/celery/branches/wheezy/debian/changelog
packages/celery/branches/wheezy/debian/patches/lsb-init.patch
packages/celery/branches/wheezy/debian/python-celery.celeryd.default
packages/celery/branches/wheezy/debian/rules
Deleted:
packages/celery/branches/wheezy/debian/python-celery.celerybeat.default
packages/celery/branches/wheezy/debian/python-celery.celeryevcam.default
Modified: packages/celery/branches/wheezy/debian/changelog
===================================================================
--- packages/celery/branches/wheezy/debian/changelog 2013-01-21 08:25:09 UTC (rev 23366)
+++ packages/celery/branches/wheezy/debian/changelog 2013-01-21 08:31:32 UTC (rev 23367)
@@ -1,7 +1,6 @@
celery (2.5.3-2) unstable; urgency=low
- * Create user celery and provide separate default files for each init
- script (Closes: #697195).
+ * Create user celery in maintainer scripts (Closes: #697195).
* Update year in d/copyright.
-- Michael Fladischer <FladischerMichael at fladi.at> Sun, 13 Jan 2013 19:10:12 +0100
Modified: packages/celery/branches/wheezy/debian/patches/lsb-init.patch
===================================================================
--- packages/celery/branches/wheezy/debian/patches/lsb-init.patch 2013-01-21 08:25:09 UTC (rev 23366)
+++ packages/celery/branches/wheezy/debian/patches/lsb-init.patch 2013-01-21 08:31:32 UTC (rev 23367)
@@ -1,14 +1,14 @@
Description: LSB compliant headers, status actions and ENABLED variable
Upstream ships it's own init scripts but they lack some LSB header and the
(optional) "status" action. This patch fixes this and also adds a variable called ENABLED
- in /etc/default/celery* while sanitizing the variables used in the init scripts.
+ in /etc/default/celeryd.
Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2013-01-17
+Last-Update: 2012-01-18
Forwarded: no
--- a/contrib/generic-init.d/celeryd
+++ b/contrib/generic-init.d/celeryd
-@@ -16,28 +16,35 @@
+@@ -16,6 +16,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: celery task worker daemon
@@ -16,17 +16,11 @@
### END INIT INFO
#set -e
-
--DEFAULT_PID_FILE="/var/run/celeryd@%n.pid"
--DEFAULT_LOG_FILE="/var/log/celeryd@%n.log"
-+DEFAULT_PID_FILE="/var/run/celery/celeryd@%n.pid"
-+DEFAULT_LOG_FILE="/var/log/celery/celeryd@%n.log"
+@@ -25,16 +26,18 @@
DEFAULT_LOG_LEVEL="INFO"
-+DEFAULT_USER="celery"
-+DEFAULT_GROUP="celery"
DEFAULT_NODES="celery"
DEFAULT_CELERYD="-m celery.bin.celeryd_detach"
-+CELERYD_ENABLED="false"
++ENABLED="false"
-# /etc/init.d/celeryd: start and stop the celery task worker daemon.
+[ -r "$CELERY_DEFAULTS" ] && . "$CELERY_DEFAULTS"
@@ -37,7 +31,7 @@
-test -f "$CELERY_DEFAULTS" && . "$CELERY_DEFAULTS"
-if [ -f "/etc/default/celeryd" ]; then
- . /etc/default/celeryd
-+if [ "$CELERYD_ENABLED" != "true" ]; then
++if [ "$ENABLED" != "true" ]; then
+ echo "celery daemon disabled - see /etc/default/celeryd."
+ exit 0
fi
@@ -46,11 +40,6 @@
CELERYD_PID_FILE=${CELERYD_PID_FILE:-${CELERYD_PIDFILE:-$DEFAULT_PID_FILE}}
CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-${CELERYD_LOGFILE:-$DEFAULT_LOG_FILE}}
CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
-+CELERYD_USER=${CELERYD_USER:-$DEFAULT_USER}
-+CELERYD_GROUP=${CELERYD_GROUP:-$DEFAULT_GROUP}
- CELERYD_MULTI=${CELERYD_MULTI:-"celeryd-multi"}
- CELERYD=${CELERYD:-$DEFAULT_CELERYD}
- CELERYCTL=${CELERYCTL:="celeryctl"}
--- a/contrib/generic-init.d/celeryevcam
+++ b/contrib/generic-init.d/celeryevcam
@@ -1,6 +1,6 @@
@@ -61,7 +50,7 @@
# ============================================
#
# :Usage: /etc/init.d/celeryd {start|stop|force-reload|restart|try-restart|status}
-@@ -78,35 +78,44 @@
+@@ -78,12 +78,13 @@
# Full path to the virtualenv environment to activate. Default is none.
### BEGIN INIT INFO
@@ -76,19 +65,11 @@
### END INIT INFO
# Cannot use set -e/bash -e since the kill -0 command will abort
- # abnormally in the absence of a valid process ID.
- #set -e
-
--DEFAULT_PID_FILE="/var/run/celeryev.pid"
--DEFAULT_LOG_FILE="/var/log/celeryev.log"
-+DEFAULT_PID_FILE="/var/run/celery/celeryev.pid"
-+DEFAULT_LOG_FILE="/var/log/celery/celeryev.log"
+@@ -94,13 +95,15 @@
+ DEFAULT_LOG_FILE="/var/log/celeryev.log"
DEFAULT_LOG_LEVEL="INFO"
-+DEFAULT_USER="celery"
-+DEFAULT_GROUP="celery"
DEFAULT_CELERYEV="/usr/bin/celeryev"
-+DEFAULT_CAM="djcelery.snapshot.Camera"
-+CELERYEV_ENABLED="false"
++ENABLED="false"
-if test -f /etc/default/celeryd; then
- . /etc/default/celeryd
@@ -99,22 +80,13 @@
-if test -f /etc/default/celeryev; then
- . /etc/default/celeryev
-+if [ "$CELERYEV_ENABLED" != "true" ]; then
-+ echo "celeryevcam daemon disabled - see /etc/default/celeryevcam."
++if [ "$ENABLED" != "true" ]; then
++ echo "celeryevcam daemon disabled - see /etc/default/celeryd."
+ exit 0
fi
CELERYEV=${CELERYEV:-$DEFAULT_CELERYEV}
- CELERYEV_PID_FILE=${CELERYEV_PID_FILE:-${CELERYEV_PIDFILE:-$DEFAULT_PID_FILE}}
- CELERYEV_LOG_FILE=${CELERYEV_LOG_FILE:-${CELERYEV_LOGFILE:-$DEFAULT_LOG_FILE}}
- CELERYEV_LOG_LEVEL=${CELERYEV_LOG_LEVEL:-${CELERYEV_LOG_LEVEL:-$DEFAULT_LOG_LEVEL}}
-+CELERYEV_USER=${CELERYEV_USER:-${CELERYD_USER:-$DEFAULT_USER}}
-+CELERYEV_GROUP=${CELERYEV_GROUP:-${CELERYD_GROUP:-$DEFAULT_GROUP}}
-+CELERYEV_CAM= ${CELERYEV_CAM:-$DEFAULT_CAM}
-
- export CELERY_LOADER
-
-@@ -197,7 +206,16 @@
+@@ -197,7 +200,16 @@
--pidfile="$CELERYEV_PID_FILE"
}
@@ -132,7 +104,7 @@
case "$1" in
start)
-@@ -216,9 +234,12 @@
+@@ -216,9 +228,12 @@
check_dev_null
start_evcam
;;
@@ -148,7 +120,7 @@
--- a/contrib/generic-init.d/celerybeat
+++ b/contrib/generic-init.d/celerybeat
-@@ -15,31 +15,36 @@
+@@ -15,6 +15,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: celery periodic task scheduler
@@ -156,18 +128,11 @@
### END INIT INFO
# Cannot use set -e/bash -e since the kill -0 command will abort
- # abnormally in the absence of a valid process ID.
- #set -e
-
--DEFAULT_PID_FILE="/var/run/celerybeat.pid"
--DEFAULT_LOG_FILE="/var/log/celerybeat.log"
-+DEFAULT_PID_FILE="/var/run/celery/celerybeat.pid"
-+DEFAULT_LOG_FILE="/var/log/celery/celerybeat.log"
-+DEFAULT_USER="celery"
-+DEFAULT_GROUP="celery"
+@@ -25,15 +26,15 @@
+ DEFAULT_LOG_FILE="/var/log/celerybeat.log"
DEFAULT_LOG_LEVEL="INFO"
DEFAULT_CELERYBEAT="celerybeat"
-+CELERYBEAT_ENABLED="false"
++ENABLED="false"
-# /etc/init.d/ssh: start and stop the celery task worker daemon.
+[ -r /etc/default/celeryd ] && . /etc/default/celeryd
@@ -179,21 +144,13 @@
-if test -f /etc/default/celerybeat; then
- . /etc/default/celerybeat
-+if [ "$CELERYBEAT_ENABLED" != "true" ]; then
-+ echo "celerybeat daemon disabled - see /etc/default/celerybeat."
++if [ "$ENABLED" != "true" ]; then
++ echo "celerybeat daemon disabled - read /etc/default/celeryd."
+ exit 0
fi
CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
- CELERYBEAT_PID_FILE=${CELERYBEAT_PID_FILE:-${CELERYBEAT_PIDFILE:-$DEFAULT_PID_FILE}}
- CELERYBEAT_LOG_FILE=${CELERYBEAT_LOG_FILE:-${CELERYBEAT_LOGFILE:-$DEFAULT_LOG_FILE}}
- CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
-+CELERYBEAT_USER=${CELERYBEAT_USER:-${CELERYD_USER:-$DEFAULT_USER}}
-+CELERYBEAT_GROUP=${CELERYBEAT_GROUP:-${CELERYD_GROUP:-$DEFAULT_GROUP}}
-
- export CELERY_LOADER
-
-@@ -125,7 +130,16 @@
+@@ -125,7 +126,16 @@
--pidfile="$CELERYBEAT_PID_FILE"
}
@@ -211,7 +168,7 @@
case "$1" in
start)
-@@ -144,9 +158,12 @@
+@@ -144,9 +154,12 @@
check_dev_null
start_beat
;;
Deleted: packages/celery/branches/wheezy/debian/python-celery.celerybeat.default
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery.celerybeat.default 2013-01-21 08:25:09 UTC (rev 23366)
+++ packages/celery/branches/wheezy/debian/python-celery.celerybeat.default 2013-01-21 08:31:32 UTC (rev 23367)
@@ -1,37 +0,0 @@
-# Edit the options in this file to match your projects environment.
-# See http://ask.github.com/celery/cookbook/daemonizing.html for the complete
-# documentation on the options.
-
-# Change this to true when done to enable the init.d script.
-# Default: false
-CELERYBEAT_ENABLED="false"
-
-# Path to the celerybeat program.
-# You can point this to an virtualenv, or even use manage.py for django.
-#CELERYBEAT="/usr/bin/celerybeat"
-
-# Where to chdir at start. This path should point to the directory containing
-# the celeryconfig.py file of a python project.
-# (required!)
-#CELERYD_CHDIR="/opt/Myproject/"
-
-# Additional arguments to celerybeat, see `celeryd --help` for a list.
-#CELERYBEAT_OPTS=""
-
-# Full path to the pidfile.
-#CELERYBEAT_PID_FILE="/var/run/celery/celerybeat.pid"
-
-# Full path to the celerybeat logfile.
-#CELERYBEAT_LOG_FILE="/var/log/celery/celerybeat.log"
-
-# Log level to use for celerybeat.
-#CELERYBEAT_LOG_LEVEL="INFO"
-
-# User to run celerybeat as.
-#CELERYBEAT_USER="celery"
-
-# Group to run celerybeat as.
-#CELERYBEAT_GROUP="celery"
-
-# Full path to the virtualenv environment to activate.
-#VIRTUALENV=""
Modified: packages/celery/branches/wheezy/debian/python-celery.celeryd.default
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery.celeryd.default 2013-01-21 08:25:09 UTC (rev 23366)
+++ packages/celery/branches/wheezy/debian/python-celery.celeryd.default 2013-01-21 08:31:32 UTC (rev 23367)
@@ -9,31 +9,27 @@
# Change this to true when done to enable the init.d script.
# Default: false
-CELERYD_ENABLED="false"
+ENABLED="false"
# Name of nodes to start
# here we have a single node
-#CELERYD_NODES="w1"
-
+CELERYD_NODES="w1"
# or we could have three nodes:
#CELERYD_NODES="w1 w2 w3"
-# Where to chdir at start. This path should point to the directory containing
-# the celeryconfig.py file of a python project.
-# (required!)
-#CELERYD_CHDIR="/opt/Myproject/"
+# Where to chdir at start.
+CELERYD_CHDIR="/opt/Myproject/"
-# Name of the celery config module.
-#CELERY_CONFIG_MODULE="celeryconfig"
-
# Extra arguments to celeryd
-#CELERYD_OPTS="--time-limit=300 --concurrency=8"
+CELERYD_OPTS="--time-limit=300 --concurrency=8"
-# Workers should run as an unprivileged user.
-#CELERYD_USER="celery"
-#CELERYD_GROUP="celery"
+# Name of the celery config module.
+CELERY_CONFIG_MODULE="celeryconfig"
# %n will be replaced with the nodename.
-#CELERYD_LOG_FILE="/var/log/celery/%n.log"
-#CELERYD_PID_FILE="/var/run/celery/%n.pid"
+CELERYD_LOG_FILE="/var/log/celery/%n.log"
+CELERYD_PID_FILE="/var/run/celery/%n.pid"
+# Workers should run as an unprivileged user.
+CELERYD_USER="celery"
+CELERYD_GROUP="celery"
Deleted: packages/celery/branches/wheezy/debian/python-celery.celeryevcam.default
===================================================================
--- packages/celery/branches/wheezy/debian/python-celery.celeryevcam.default 2013-01-21 08:25:09 UTC (rev 23366)
+++ packages/celery/branches/wheezy/debian/python-celery.celeryevcam.default 2013-01-21 08:31:32 UTC (rev 23367)
@@ -1,39 +0,0 @@
-# Edit the options in this file to match your projects environment.
-# See http://ask.github.com/celery/cookbook/daemonizing.html for the complete
-# documentation on the options.
-
-# Change this to true when done to enable the init.d script.
-# Default: false
-CELERYEV_ENABLED="false"
-
-# Path to the celeryev program.
-# You can point this to an virtualenv, or even use manage.py for django.
-#CELERYEV="/opt/myproject/manage.py"
-
-# Additional arguments to celeryd, see `celeryd --help` for a list.
-#CELERYEV_OPTS=""
-
-# Camera class to use.
-#CELERYEV_CAM="djcelery.snapshot.Camera"
-
-# User to run celeryev as.
-#CELERYEV_USER="celery"
-
-# Group to run celeryev as.
-#CELERYEV_GROUP="celery"
-
-# Full path to the virtualenv environment to activate.
-#VIRTUALENV=""
-
-# Path to chdir at start.
-#CELERYEV_CHDIR="/opt/myproject"
-
-# Full path to the pidfile.
-#CELERYEV_PID_FILE="/var/run/celery/celeryev.pid"
-
-# Full path to the celeryev logfile.
-#CELERYEV_LOG_FILE="/var/log/celery/celeryev.log"
-
-# Log level to use for celeryev.
-#CELERYEV_LOG_LEVEL="INFO"
-
Modified: packages/celery/branches/wheezy/debian/rules
===================================================================
--- packages/celery/branches/wheezy/debian/rules 2013-01-21 08:25:09 UTC (rev 23366)
+++ packages/celery/branches/wheezy/debian/rules 2013-01-21 08:31:32 UTC (rev 23367)
@@ -43,3 +43,4 @@
dh_installinit --name celerybeat
dh_installinit --name celeryd
dh_installinit --name celeryevcam
+ dh_installinit --name celery
More information about the Python-modules-commits
mailing list