From 083966ea946c9faba22a70089052121c8cf45720 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 17 May 2019 02:59:09 +0200
Subject: [PATCH] Switch php-fpm order

---
 scripts/remove  | 16 ++++++++--------
 scripts/restore | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 71b1224..4ec6199 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -51,6 +51,14 @@ ynh_script_progression --message="Removing the MySQL database..." --time --weigh
 # Remove a database if it exists, along with the associated user
 ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 
+#=================================================
+# REMOVE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1
+
+# Remove the dedicated php-fpm config
+ynh_remove_fpm_config
+
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
@@ -75,14 +83,6 @@ ynh_script_progression --message="Removing nginx web server configuration..." --
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1
-
-# Remove the dedicated php-fpm config
-ynh_remove_fpm_config
-
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 9b68d49..8877ad9 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,12 +74,6 @@ ynh_system_user_create --username=$app
 # Restore permissions on app files
 chown -R root: $final_path
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
-
 #=================================================
 # RESTORE FAIL2BAN CONFIGURATION
 #=================================================
@@ -108,6 +102,12 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+
+ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+
 #=================================================
 # RESTORE SYSTEMD
 #=================================================