diff --git a/manifest.json b/manifest.json index 4090135..c26e888 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "email": "maniackc_dev@crudelis.fr" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 4.1.3" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 31f0177..73df6fc 100755 --- a/scripts/install +++ b/scripts/install @@ -80,6 +80,7 @@ ynh_script_progression --message="Configuring php-fpm..." # Create a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index 763c1fb..c5fcbbf 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,7 +27,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -YNH_PHP_VERSION=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -78,6 +78,7 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..." # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # GENERIC FINALIZATION @@ -86,8 +87,7 @@ ynh_add_fpm_config --usage=low --footprint=low #================================================= ynh_script_progression --message="Reloading nginx web server and php-fpm..." -sleep 10 -ynh_systemd_action --service_name=php$YNH_PHP_VERSION-fpm --action=reload +ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 530065d..4574761 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,6 +82,7 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # GENERIC FINALIZATION