From 2123e49f223296df698648d7ae9e108d30ff9b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sun, 10 Jul 2016 18:42:32 +0200
Subject: [PATCH] [fix] Reorder app removal steps

---
 scripts/remove | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index c5db8e1..e23178b 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -8,6 +8,14 @@ source /usr/share/yunohost/helpers
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
 
+# Remove nginx and php-fpm configuration files
+sudo rm -f "/etc/nginx/conf.d/${domain}.d/movim.conf"
+sudo rm -f "/etc/php5/fpm/pool.d/movim.conf"
+
+# Reload services
+sudo service nginx reload
+sudo service php5-fpm restart
+
 # Stop service and remove it
 sudo service movim stop
 if [ -d /run/systemd/system ]; then
@@ -26,14 +34,6 @@ ynh_mysql_drop_db "$db_name" || true
 ynh_mysql_drop_user "$db_user" || true
 
 # Remove Movim files and user
+sudo rm -rf /var/www/movim
 ynh_system_user_exists movim \
   && sudo userdel movim
-sudo rm -rf /var/www/movim
-
-# Remove nginx and php-fpm configuration files
-sudo rm -f /etc/nginx/conf.d/$domain.d/movim.conf
-sudo rm -f /etc/php5/fpm/pool.d/movim.conf
-
-# Reload services
-sudo service nginx reload
-sudo service php5-fpm restart