From 4c547a73e20875febf7f98779b51a808c92c4eb9 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 19 Mar 2019 13:55:13 +0100
Subject: Prepare instance script: start celery daemon at the end

---
 install/ishtar-delete-instance | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'install/ishtar-delete-instance')

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 ""
-- 
cgit v1.2.3