From dbd92b090ad9a7ce0b3428623667f308547eca88 Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Sun, 9 Apr 2017 03:26:55 +0200
Subject: Update install

---
 scripts/remove | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'scripts/remove')

diff --git a/scripts/remove b/scripts/remove
index d4e896f..b8f2d6b 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -13,6 +13,27 @@ app=$YNH_APP_INSTANCE_NAME
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
 
+# Delete service on Yunohost monitoring
+if sudo yunohost service status | grep -q mastodon-web
+then
+	echo "Remove mastodon-web service"
+	sudo yunohost service remove mastodon-web
+fi
+
+# Delete service on Yunohost monitoring
+if sudo yunohost service status | grep -q mastodon-sidekiq
+then
+	echo "Remove mastodon-sidekiq service"
+	sudo yunohost service remove mastodon-sidekiq
+fi
+
+# Delete service on Yunohost monitoring
+if sudo yunohost service status | grep -q mastodon-streaming
+then
+	echo "Remove mastodon-streaming service"
+	sudo yunohost service remove mastodon-streaming
+fi
+
 # Stop mastodon-web
 if [ -e "/etc/systemd/system/mastodon-web.service" ]; then
 	echo "Delete systemd script"
@@ -37,27 +58,6 @@ if [ -e "/etc/systemd/system/mastodon-streaming.service" ]; then
 	sudo systemctl disable mastodon-streaming.service
 fi
 
-# Delete service on Yunohost monitoring
-if sudo yunohost service status | grep -q mastodon-web
-then
-	echo "Remove mastodon-web service"
-	sudo yunohost service remove mastodon-web
-fi
-
-# Delete service on Yunohost monitoring
-if sudo yunohost service status | grep -q mastodon-sidekiq
-then
-	echo "Remove mastodon-sidekiq service"
-	sudo yunohost service remove mastodon-sidekiq
-fi
-
-# Delete service on Yunohost monitoring
-if sudo yunohost service status | grep -q mastodon-streaming
-then
-	echo "Remove mastodon-streaming service"
-	sudo yunohost service remove mastodon-streaming
-fi
-
 # delete postgresql database & user
 ynh_psql_drop_db $app
 ynh_psql_drop_user $app
-- 
cgit v1.2.3-70-g09d2