From dd5aff6203578be4a7bf1ab92ea87f041b6f51c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 6 Jan 2021 16:54:00 +0100
Subject: [PATCH] Add extra php dependencies (#73)

---
 check_process      | 1 -
 scripts/_common.sh | 2 ++
 scripts/install    | 2 +-
 scripts/restore    | 3 +++
 scripts/upgrade    | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index af56a08..5302a20 100644
--- a/check_process
+++ b/check_process
@@ -17,7 +17,6 @@
 		upgrade=1	from_commit=01add99d3d903ca6d07f863045edf2ba46cf18d5
 		backup_restore=1
 		multi_instance=1
-		incorrect_path=1
 		port_already_use=0
 		change_url=1
 ;;; Options
diff --git a/scripts/_common.sh b/scripts/_common.sh
index d7614e9..115991f 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,6 +6,8 @@
 
 YNH_PHP_VERSION="7.3"
 
+extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-gd"
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 2066dad..b3dfdf5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -83,7 +83,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 8e49f15..213eb9f 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,9 +89,12 @@ chown -R $app:root $final_path/lib/tpl
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
+ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=5
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
+ynh_add_fpm_config --package="$extra_php_dependencies"
+
 #=================================================
 # RESTORE FAIL2BAN CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 9e6c3c2..f87cc73 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -187,7 +187,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE