From 7ce242144a455c18f8a2badfc8cb9e40c9f97259 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 28 Mar 2019 23:49:33 +0100
Subject: [PATCH] Remove ynh_add_php71-fpm_config

---
 scripts/_common.sh | 36 ------------------------------------
 scripts/install    |  2 +-
 scripts/remove     |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 40125601..2075af05 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -62,39 +62,3 @@ init_composer() {
 	exec_composer "$AS_USER" "$WORKDIR" install --no-dev \
 		|| ynh_die "Unable to update core dependencies with Composer"
 }
-
-
-# Create a dedicated php-fpm config for php7.1
-#
-# usage: ynh_add_fpm_config
-ynh_add_php71-fpm_config () {
-	finalphpconf="/etc/php/7.1/fpm/pool.d/$app.conf"
-	ynh_backup_if_checksum_is_different "$finalphpconf"
-	cp ../conf/php-fpm.conf "$finalphpconf"
-	ynh_replace_string "__NAMETOCHANGE__" "$app" "$finalphpconf"
-	ynh_replace_string "__FINALPATH__" "$final_path" "$finalphpconf"
-	ynh_replace_string "__USER__" "$app" "$finalphpconf"
-	chown root: "$finalphpconf"
-	ynh_store_file_checksum "$finalphpconf"
-
-	if [ -e "../conf/php-fpm.ini" ]
-	then
-		finalphpini="/etc/php/7.1/fpm/conf.d/20-$app.ini"
-		ynh_backup_if_checksum_is_different "$finalphpini"
-		cp ../conf/php-fpm.ini "$finalphpini"
-		chown root: "$finalphpini"
-		ynh_store_file_checksum "$finalphpini"
-	fi
-
-	systemctl reload php7.1-fpm
-}
-
-
-# Remove the dedicated php-fpm config for php7.1
-#
-# usage: ynh_remove_fpm_config
-ynh_remove_php71-fpm_config () {
-	ynh_secure_remove "/etc/php/7.1/fpm/pool.d/$app.conf"
-	ynh_secure_remove "/etc/php/7.1/fpm/conf.d/20-$app.ini" 2>&1
-	systemctl reload php7.1-fpm
-}
diff --git a/scripts/install b/scripts/install
index 10af87d3..39944be3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -105,7 +105,7 @@ ynh_system_user_create $app
 #=================================================
 
 # Create a dedicated php-fpm config
-ynh_add_php71-fpm_config
+ynh_add_fpm_config --phpversion=7.1
 
 #=================================================
 # INSTALL PHP DEPENDENCIES
diff --git a/scripts/remove b/scripts/remove
index 58f4771e..2a7a9287 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -65,7 +65,7 @@ ynh_remove_nginx_config
 ynh_print_info "Removing php-fpm configuration"
 
 # Remove the dedicated php-fpm config
-ynh_remove_php71-fpm_config
+ynh_remove_fpm_config
 
 #=================================================
 # GENERIC FINALIZATION