From c402dc264363ec95ea8fd0ddb6e54a1a47f5e338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 3 Mar 2022 09:53:43 +0100
Subject: [PATCH] Remove extra_php_dependencies (#39)

---
 scripts/_common.sh | 5 +----
 scripts/install    | 2 +-
 scripts/restore    | 4 ++--
 scripts/upgrade    | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7b8c11b..fe3cb86 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,14 +4,11 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies="postgresql postgresql-contrib apt-transport-https"
-
 YNH_PHP_VERSION="7.3"
 
 YNH_COMPOSER_VERSION="2.2.5"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-xml"
+pkg_dependencies="postgresql postgresql-contrib apt-transport-https php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-xml"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 5042b72..12d4b5f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -124,7 +124,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ac7fe25..da8297e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -79,8 +79,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..."
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-# Recreate a dedicated php-fpm config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+# Recreate a dedicated PHP-FPM config
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 25986fc..cfc5796 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -129,7 +129,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC SETUP