From bb89459f9148e1ada7a188bd61af3beb2c3d7bb5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 1 Apr 2019 06:12:43 +0200
Subject: [PATCH] Revert "fix php-fpm"

This reverts commit ec26cf58e131843eb2325c7a571b53de4413a471.
---
 scripts/install |  5 +++--
 scripts/remove  |  9 +++++----
 scripts/upgrade | 13 ++++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index ef9b9e32..4c263969 100644
--- a/scripts/install
+++ b/scripts/install
@@ -106,8 +106,9 @@ ynh_print_info "Configuring php-fpm..."
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --phpversion="7.2"
 
-#Workaround waiting 'ynh_add_fpm_config --phpversion='' released
-cp "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf"
+#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
+mv "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf"
+systemctl reload php7.0-fpm
 systemctl reload php7.2-fpm
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 7bea232a..5784d04e 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -47,13 +47,14 @@ ynh_remove_nginx_config
 #=================================================
 ynh_print_info "Removing php-fpm configuration"
 
+#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
+mv "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf"
+systemctl reload php7.2-fpm
+systemctl reload php7.0-fpm
+
 # Remove the dedicated php-fpm config
 ynh_remove_fpm_config
 
-#Workaround waiting 'ynh_add_fpm_config --phpversion='' released
-ynh_secure_remove "/etc/php/7.2/fpm/pool.d/$app.conf"
-systemctl reload php7.2-fpm
-
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a8299a8f..43e89c46 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -116,11 +116,16 @@ ynh_system_user_create "$app"
 #=================================================
 ynh_print_info "Upgrading php-fpm configuration..."
 
+mv -f "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf"
+systemctl reload php7.0-fpm
+systemctl reload php7.2-fpm
+
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --phpversion="7.2"
 
-#Workaround waiting 'ynh_add_fpm_config --phpversion='' released
-cp -f "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf"
+#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
+mv -f "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf"
+systemctl reload php7.0-fpm
 systemctl reload php7.2-fpm
 
 #=================================================
@@ -148,7 +153,9 @@ pushd "$final_path"
 	php7.2 artisan horizon:purge
 popd
 
-ynh_backup_if_checksum_is_different "$final_path/.env"
+
+
+ynh_backup_if_checksum_is_different "$final_path/CONFIG_FILE"
 # Recalculate and store the checksum of the file for the next upgrade.
 ynh_store_file_checksum "$final_path/.env"