diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-02 17:47:10 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:20 +0100 |
| commit | dc850e386f19d97d80efd77302425433a204d08b (patch) | |
| tree | 4b33f1b6fa495c8b5c9fb9441aee138b2a6f8251 /install/ishtar-prepare-instance | |
| parent | 160ad56539be0a2e27b8ae1ec5575c9f7762b798 (diff) | |
| download | Ishtar-dc850e386f19d97d80efd77302425433a204d08b.tar.bz2 Ishtar-dc850e386f19d97d80efd77302425433a204d08b.zip | |
Use supervisor instead of systemd script for celery daemon
Diffstat (limited to 'install/ishtar-prepare-instance')
| -rwxr-xr-x | install/ishtar-prepare-instance | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index c47881bad..f176d8f90 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -260,14 +260,14 @@ EOF /usr/sbin/rabbitmqctl set_permissions -p /ishtar$INSTANCE ishtar$INSTANCE ".*" ".*" ".*" CELERY_CONF="CELERY_BROKER_URL = 'amqp://ishtar"$INSTANCE":"$RBMQ_PASSWORD"@localhost//ishtar"$INSTANCE"'" 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 + + # supervisor conf no matter what + mkdir -p /etc/supervisor/conf.d/ sed -s "s|#APP_NAME#|$INSTANCE|g;\ s|#INSTALL_PATH#|$INSTALL_PATH|g;"\ - "install/celery.service.template" > \ - "/etc/systemd/system/celery-"$INSTANCE".service" + "install/supervisor.template" > \ + "/etc/supervisor/conf.d/celery_"$INSTANCE".conf" + sed -s "s|example_project|$INSTANCE|g;" \ $INSTANCE"/celery_app.py.sample" > \ $INSTANCE"/celery_app.py" @@ -276,7 +276,7 @@ EOF "install/monit.template" > \ "/etc/monit/conf-available/celery-"$INSTANCE fi - systemctl daemon-reload + fi ### __init__.py @@ -386,8 +386,11 @@ EOF ### Celery - start worker if [ $USE_CELERY = 'yes' ]; then - systemctl enable celery-$INSTANCE - systemctl start celery-$INSTANCE + SUPERVISOR=`which supervisorctl` + if [ $SUPERVISOR ]; then + supervisorctl add celery_$INSTANCE + supervisorctl start celery_$INSTANCE + fi fi cecho y " - create superuser" |