[Python-modules-commits] r26014 - in packages/celery/trunk/debian (5 files)

[fladi-guest at users.alioth.debian.org]

    Date: Monday, September 30, 2013 @ 12:12:52
  Author: fladi-guest
Revision: 26014

Move default/celery file to celeryd package.

Added:
  packages/celery/trunk/debian/celeryd.celery.default
    (from rev 25734, packages/celery/trunk/debian/celeryd.default)
  packages/celery/trunk/debian/celeryd.dirs
Modified:
  packages/celery/trunk/debian/celeryd.postinst
  packages/celery/trunk/debian/rules
Deleted:
  packages/celery/trunk/debian/celeryd.default

Copied: packages/celery/trunk/debian/celeryd.celery.default (from rev 25734, packages/celery/trunk/debian/celeryd.default)
===================================================================
--- packages/celery/trunk/debian/celeryd.celery.default	                        (rev 0)
+++ packages/celery/trunk/debian/celeryd.celery.default	2013-09-30 12:12:52 UTC (rev 26014)
@@ -0,0 +1,35 @@
+# 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.
+
+# WARNING: This script is only designed to run the worker(s) for a single
+# project. If you need to start workers for multiple projects you should
+# consider using supervisor.
+# Examples can be found in /usr/share/doc/python-celery/supervisord/
+
+# Change this to true when done to enable the init.d script.
+# Default: false
+ENABLED="false"
+
+# Name of nodes to start
+# here we have a single node
+CELERYD_NODES="w1"
+# or we could have three nodes:
+#CELERYD_NODES="w1 w2 w3"
+
+# Where to chdir at start.
+CELERYD_CHDIR="/opt/Myproject/"
+
+# Extra arguments to celeryd
+CELERYD_OPTS="--time-limit=300 --concurrency=8"
+
+# 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"
+
+# Workers should run as an unprivileged user.
+CELERYD_USER="celery"
+CELERYD_GROUP="celery"

Deleted: packages/celery/trunk/debian/celeryd.default
===================================================================
Added: packages/celery/trunk/debian/celeryd.dirs
===================================================================
--- packages/celery/trunk/debian/celeryd.dirs	                        (rev 0)
+++ packages/celery/trunk/debian/celeryd.dirs	2013-09-30 12:12:52 UTC (rev 26014)
@@ -0,0 +1 @@
+var/log/celery

Modified: packages/celery/trunk/debian/celeryd.postinst
===================================================================
--- packages/celery/trunk/debian/celeryd.postinst	2013-09-30 06:45:14 UTC (rev 26013)
+++ packages/celery/trunk/debian/celeryd.postinst	2013-09-30 12:12:52 UTC (rev 26014)
@@ -4,13 +4,22 @@
 
 case "$1" in
     configure|reconfigure)
-        adduser \
-            --system \
-            --quiet \
-            --home /nonexistant \
-            --no-create-home \
-            --group \
-            celery
+        if ! getent passwd celery > /dev/null ; then
+            echo 'Adding system user for Celery' 1>&2
+            adduser \
+                --system \
+                --quiet \
+                --home /nonexistant \
+                --no-create-home \
+                --group \
+                --gecos "Celery daemon" \
+                celery
+        fi
+
+        if ! dpkg-statoverride --list /var/log/celery >/dev/null; then
+            chown celery:adm /var/log/celery
+            chmod 750 /var/log/celery
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: packages/celery/trunk/debian/rules
===================================================================
--- packages/celery/trunk/debian/rules	2013-09-30 06:45:14 UTC (rev 26013)
+++ packages/celery/trunk/debian/rules	2013-09-30 12:12:52 UTC (rev 26014)
@@ -43,7 +43,6 @@
 	dh_installinit --name celerybeat
 	dh_installinit --name celeryd
 	dh_installinit --name celeryevcam
-	dh_installinit --name celery
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs: