From e1fc69b89381c5720636c194dacfea22d0cda582 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 14 Nov 2020 09:33:32 +0100 Subject: [PATCH] Remove unneeded phpversion --- scripts/_common.sh | 2 -- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 62b5714..7b7f25e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -116,5 +116,3 @@ ynh_multimedia_addfolder () { ./yunohost.multimedia-master/script/ynh_media_addfolder.sh --source="$source_dir" --dest="$dest_dir" } - - diff --git a/scripts/install b/scripts/install index 5e5e931..33d3013 100755 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,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 --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 75e49fa..53e31ec 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,7 +110,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 --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE