diff options
| author |   Corentin Chary <iksaif@gentoo.org> | 2012-08-15 08:25:23 +0000 |
|---|---|---|
| committer | Corentin Chary <iksaif@gentoo.org> | 2012-08-15 08:25:23 +0000 |
| commit | a7faa0537c2c9a1035cf3f492cf2d91caebe3ec5 (patch) | |
| tree | 4c05f7b8ac79f2b160ba7b36a8a62a06c9b0a5f5 /dev-python/celery | |
| parent | Stable for x86, wrt bug #428926 (diff) | |
| download | gentoo-2-a7faa0537c2c9a1035cf3f492cf2d91caebe3ec5.tar.gz gentoo-2-a7faa0537c2c9a1035cf3f492cf2d91caebe3ec5.tar.bz2 gentoo-2-a7faa0537c2c9a1035cf3f492cf2d91caebe3ec5.zip | |
Enhance init script.
(Portage version: 2.1.11.10/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/celery')
| -rw-r--r-- | dev-python/celery/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/celery/celery-3.0.5-r1.ebuild (renamed from dev-python/celery/celery-3.0.5.ebuild) | 2 | ||||
| -rw-r--r-- | dev-python/celery/files/celery.confd | 4 | ||||
| -rw-r--r-- | dev-python/celery/files/celery.initd | 22 |
4 files changed, 17 insertions, 19 deletions
diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog index 6e9e1891baf6..50ecde80dbb8 100644 --- a/dev-python/celery/ChangeLog +++ b/dev-python/celery/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/celery # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.6 2012/08/14 07:23:41 iksaif Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.7 2012/08/15 08:25:23 iksaif Exp $ + +*celery-3.0.5-r1 (15 Aug 2012) + + 15 Aug 2012; Corentin Chary <iksaif@gentoo.org> +celery-3.0.5-r1.ebuild, + -celery-3.0.5.ebuild, files/celery.confd, files/celery.initd: + Enhance init script. 14 Aug 2012; Corentin Chary <iksaif@gentoo.org> -celery-2.5.5.ebuild: Remove old version. diff --git a/dev-python/celery/celery-3.0.5.ebuild b/dev-python/celery/celery-3.0.5-r1.ebuild index 248a49efc434..0ef3478bc91d 100644 --- a/dev-python/celery/celery-3.0.5.ebuild +++ b/dev-python/celery/celery-3.0.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.5.ebuild,v 1.1 2012/08/14 07:20:20 iksaif Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.5-r1.ebuild,v 1.1 2012/08/15 08:25:23 iksaif Exp $ EAPI="4" diff --git a/dev-python/celery/files/celery.confd b/dev-python/celery/files/celery.confd index 6c34927cbd31..b952c9817c14 100644 --- a/dev-python/celery/files/celery.confd +++ b/dev-python/celery/files/celery.confd @@ -13,6 +13,10 @@ # django project, but you can still override them here. #CELERY_DJANGO="yes" +# This is generaly a good idea to set the environment correctly +# because a lot of python package try to use HOME on init +#export HOME="/var/lib/myproject" + # Full path to the python project directory. #CELERY_PROJDIR="/var/lib/myproject" diff --git a/dev-python/celery/files/celery.initd b/dev-python/celery/files/celery.initd index d289499b5108..3268605956fd 100644 --- a/dev-python/celery/files/celery.initd +++ b/dev-python/celery/files/celery.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the BSD license -# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/files/celery.initd,v 1.2 2012/07/16 08:33:58 iksaif Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/files/celery.initd,v 1.3 2012/08/15 08:25:23 iksaif Exp $ extra_started_commands="reload" @@ -43,29 +43,17 @@ else CELERYEV=${CELERYEV:-"celeryev"} fi -CELERYD_OPTS="$CELERYD_OPTS -f $CELERYD_LOG_FILE -l $CELERYD_LOG_LEVEL" +CELERYD_OPTS="$CELERYD_OPTS" CELERYBEAT_OPTS="$CELERYBEAT_OPTS -f $CELERYBEAT_LOG_FILE -l $CELERYBEAT_LOG_LEVEL" CELERYEV_OPTS="$CELERYEV_OPTS -f $CELERYEV_LOG_FILE -l $CELERYEV_LOG_LEVEL -c $CELERYEV_CAM" create_dirs() { local logfile="$1" local pidfile="$2" - local logdir=`dirname $logfile` - local piddir=`dirname $pidfile` + local logdir=$(dirname $logfile) + local piddir=$(dirname $pidfile) - if [ ! -d "$logdir" ]; then - mkdir -p $logdir - fi - if [ ! -d "$piddir" ]; then - mkdir -p $piddir - fi - - if [ -n "$CELERY_USER" ]; then - chown "$CELERY_USER" $logdir $piddir - fi - if [ -n "$CELERY_GROUP" ]; then - chown ":$CELERY_GROUP" $logdir $piddir - fi + checkpath -d -q -m 0750 -o ${CELERY_USER:-"root"}:${CELERY_GROUP:-"root"} $logdir $piddir } if [ -n "$CELERY_USER" ]; then |