Prepare instance script: start celery daemon at the end

2 files changed, 14 insertions, 9 deletions

diff --git a/install/ishtar-delete-instance b/install/ishtar-delete-instance
index 46b0d86c6..d2f5115c4 100755
--- a/install/ishtar-delete-instance
+++ b/install/ishtar-delete-instance
@@ -86,6 +86,13 @@ do_delete_instance() {
     rm -f "$UWSGI_AVAILABLE_PATH/ishtar-$INSTANCE.ini"
     rm -f "$UWSGI_ENABLE_PATH/ishtar-$INSTANCE.ini"
 
+    DB_NAME="ishtar-$INSTANCE"
+    export DB_NAME
+    su postgres <<'EOF'
+        dropdb "$DB_NAME"
+        dropuser "$DB_NAME"
+EOF
+
     if [ -v USE_CELERY ]; then
         systemctl disable celery-$INSTANCE
         systemctl stop celery-$INSTANCE
@@ -96,13 +103,6 @@ do_delete_instance() {
         systemctl daemon-reload
     fi
 
-    DB_NAME="ishtar-$INSTANCE"
-    export DB_NAME
-    su postgres <<'EOF'
-        dropdb "$DB_NAME"
-        dropuser "$DB_NAME"
-EOF
-
     echo ""
     cecho g $to_delete" have been completly removed"
     echo ""
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance
index c8d944dc9..df7b72088 100755
--- a/install/ishtar-prepare-instance
+++ b/install/ishtar-prepare-instance
@@ -278,8 +278,6 @@ EOF
             "install/celery.service.template" > \
             "/etc/systemd/system/celery-"$INSTANCE".service"
         systemctl daemon-reload
-        systemctl enable celery-$INSTANCE
-        systemctl start celery-$INSTANCE
     fi
 
     ### __init__.py
@@ -376,6 +374,13 @@ EOF
     cd ..
     $PYTHON ./install/post_install_script.py $INSTANCE $URL
 
+    ### Celery - start worker
+
+    if [ -v USE_CELERY ]; then
+        systemctl enable celery-$INSTANCE
+        systemctl start celery-$INSTANCE
+    fi
+
     cat >&2 <<-'EOF'
 
 -------------------------------------------------------------------------------