From 78eb9393d6c83795f962a371aeebf05dae75a1ac Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 21 Mar 2019 19:13:25 +0100
Subject: Celery install: fix runtime directory

---
 install/celery.service.template  | 1 +
 install/celeryd.default.template | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'install')

diff --git a/install/celery.service.template b/install/celery.service.template
index 1d7278c7c..26b907df6 100644
--- a/install/celery.service.template
+++ b/install/celery.service.template
@@ -7,6 +7,7 @@ Type=forking
 User=www-data
 Group=www-data
 EnvironmentFile=/etc/default/celeryd-#APP_NAME#
+RuntimeDirectory=celery
 WorkingDirectory=#INSTALL_PATH#
 ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} \
   -c ${CELERY_PROCESS_NUMBER} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
diff --git a/install/celeryd.default.template b/install/celeryd.default.template
index 39c97b902..26f66ad06 100644
--- a/install/celeryd.default.template
+++ b/install/celeryd.default.template
@@ -11,7 +11,7 @@ CELERY_APP="#APP_NAME#"
 
 # Log and PID directories
 CELERYD_LOG_FILE="/var/log/celery/#APP_NAME#%n%I.log"
-CELERYD_PID_FILE="/var/run/celery/#APP_NAME#%n.pid"
+CELERYD_PID_FILE="/run/celery/#APP_NAME#%n.pid"
 
 # Log level
 CELERYD_LOG_LEVEL=INFO
-- 
cgit v1.2.3