[generic-init.d] Can now configure CELERY_CREATE_DIRS to always create pid/log dirs. Closes #1045

extra/generic-init.d/celerybeat

@@ -6,7 +6,7 @@
 # :Usage: /etc/init.d/celerybeat {start|stop|force-reload|restart|try-restart|status}
 # :Configuration file: /etc/default/celerybeat or /etc/default/celeryd
 #
-# See http://docs.celeryproject.org/en/latest/tutorials/daemonizing.html#generic-init-scripts 
+# See http://docs.celeryproject.org/en/latest/tutorials/daemonizing.html#generic-init-scripts
 
 ### BEGIN INIT INFO
 # Provides:          celerybeat
@@ -38,8 +38,11 @@ fi
 
 CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
 CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
-CELERY_CREATE_RUNDIR=0
-CELERY_CREATE_LOGDIR=0
+
+# Set CELERY_CREATE_DIRS to always create log/pid dirs.
+CELERY_CREATE_DIRS=${CELERY_CREATE_DIRS:-0}
+CELERY_CREATE_RUNDIR=$CELERY_CREATE_DIRS
+CELERY_CREATE_LOGDIR=$CELERY_CREATE_DIRS
 if [ -z "$CELERYBEAT_PID_FILE" ]; then
     CELERYBEAT_PID_FILE="$DEFAULT_PID_FILE"
     CELERY_CREATE_RUNDIR=1

extra/generic-init.d/celeryd

@@ -6,7 +6,7 @@
 # :Usage: /etc/init.d/celeryd {start|stop|force-reload|restart|try-restart|status}
 # :Configuration file: /etc/default/celeryd
 #
-# See http://docs.celeryproject.org/en/latest/tutorials/daemonizing.html#generic-init-scripts 
+# See http://docs.celeryproject.org/en/latest/tutorials/daemonizing.html#generic-init-scripts
 
 
 ### BEGIN INIT INFO
@@ -35,8 +35,10 @@ if [ -f "/etc/default/celeryd" ]; then
     . /etc/default/celeryd
 fi
 
-CELERY_CREATE_RUNDIR=0
-CELERY_CREATE_LOGDIR=0
+# Set CELERY_CREATE_DIRS to always create log/pid dirs.
+CELERY_CREATE_DIRS=${CELERY_CREATE_DIRS:-0}
+CELERY_CREATE_RUNDIR=$CELERY_CREATE_DIRS
+CELERY_CREATE_LOGDIR=$CELERY_CREATE_DIRS
 if [ -z "$CELERYD_PID_FILE" ]; then
     CELERYD_PID_FILE="$DEFAULT_PID_FILE"
     CELERY_CREATE_RUNDIR=1