diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-29 18:58:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-07-01 18:02:28 +0200 |
| commit | 16ca951c15d381a854494e800639bf6020cb4131 (patch) | |
| tree | db6e5857136191ce72ef5013d1565041f14f15b2 /install | |
| parent | eba6f89f2907a4bd3a843644a79e5c2a40f26428 (diff) | |
| download | Ishtar-16ca951c15d381a854494e800639bf6020cb4131.tar.bz2 Ishtar-16ca951c15d381a854494e800639bf6020cb4131.zip | |
Install: fix celery bin path
Diffstat (limited to 'install')
| -rw-r--r-- | install/celeryd.default.template | 2 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/install/celeryd.default.template b/install/celeryd.default.template index 26f66ad06..1337d8f92 100644 --- a/install/celeryd.default.template +++ b/install/celeryd.default.template @@ -17,7 +17,7 @@ CELERYD_PID_FILE="/run/celery/#APP_NAME#%n.pid" CELERYD_LOG_LEVEL=INFO # Path to celery binary, that is in your virtual environment -CELERY_BIN=/usr/local/bin/celery +CELERY_BIN=#CELERY_BIN_PATH# # to debug the service it could be necessary to uncomment the following line # C_FAKEFORK=1 diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index b21ed7a0f..c07072eee 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -259,7 +259,9 @@ EOF /usr/sbin/rabbitmqctl add_user ishtar$INSTANCE $RBMQ_PASSWORD /usr/sbin/rabbitmqctl set_permissions -p /ishtar$INSTANCE ishtar$INSTANCE ".*" ".*" ".*" CELERY_CONF="CELERY_BROKER_URL = 'amqp://ishtar"$INSTANCE":"$RBMQ_PASSWORD"@localhost//ishtar"$INSTANCE"'" - sed -s "s|#APP_NAME#|$INSTANCE|g;" \ + CELERY_BIN_PATH=`which celery` + sed -s "s|#APP_NAME#|$INSTANCE|g;\ + s|#CELERY_BIN_PATH#|$CELERY_BIN_PATH|g;" \ "install/celeryd.default.template" > \ "/etc/default/celeryd-"$INSTANCE sed -s "s|#APP_NAME#|$INSTANCE|g;\ |