diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-03-19 13:44:53 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | 7045eb8c2c3ca96166472feaca0c28e0b252d441 (patch) | |
| tree | 5560029b47a9eb61c1a80454ff0659e4fd6a6227 | |
| parent | 3fd0b846132fd25677fe14f92f946a71db7518c8 (diff) | |
| download | Ishtar-7045eb8c2c3ca96166472feaca0c28e0b252d441.tar.bz2 Ishtar-7045eb8c2c3ca96166472feaca0c28e0b252d441.zip | |
Prepare instance script: fix celery systemd service
| -rwxr-xr-x | install/ishtar-delete-instance | 6 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/install/ishtar-delete-instance b/install/ishtar-delete-instance index 7e4883192..46b0d86c6 100755 --- a/install/ishtar-delete-instance +++ b/install/ishtar-delete-instance @@ -87,12 +87,12 @@ do_delete_instance() { rm -f "$UWSGI_ENABLE_PATH/ishtar-$INSTANCE.ini" if [ -v USE_CELERY ]; then - systemctl disable celeryd-$INSTANCE - systemctl stop celeryd-$INSTANCE + systemctl disable celery-$INSTANCE + systemctl stop celery-$INSTANCE /usr/sbin/rabbitmqctl delete_vhost /ishtar$INSTANCE /usr/sbin/rabbitmqctl delete_user ishtar$INSTANCE rm "/etc/default/celeryd-"$INSTANCE - rm "/etc/default/celeryd-"$INSTANCE + rm "/etc/systemd/system/celery-"$INSTANCE".service" systemctl daemon-reload fi diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index 60fd0e39f..c8d944dc9 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -276,10 +276,10 @@ EOF sed -s "s|#APP_NAME#|$INSTANCE|g;\ s|#INSTALL_PATH#|$INSTALL_PATH|g;"\ "install/celery.service.template" > \ - "/etc/default/celeryd-"$INSTANCE + "/etc/systemd/system/celery-"$INSTANCE".service" systemctl daemon-reload - systemctl enable celeryd-$INSTANCE - systemctl start celeryd-$INSTANCE + systemctl enable celery-$INSTANCE + systemctl start celery-$INSTANCE fi ### __init__.py |