diff --git a/scripts/install b/scripts/install index 6c1a400..17a6d6e 100755 --- a/scripts/install +++ b/scripts/install @@ -78,8 +78,8 @@ ynh_script_progression --message="Installing dependencies..." ### - As well as the section "REINSTALL DEPENDENCIES" in the restore script ### - And the section "UPGRADE DEPENDENCIES" in the upgrade script - -ynh_install_php --phpversion="7.2" --package="$pkg_dependencies" +# Create a dedicated php-fpm7.2 config +ynh_add_fpm_config --phpversion="7.2" --package="$pkg_dependencies" #================================================= # CREATE A MYSQL DATABASE @@ -132,26 +132,6 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app -#================================================= -# PHP-FPM 7.2 CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring php-fpm..." - - -### `ynh_add_fpm_config` is used to set up a PHP config. -### You can remove it if your app doesn't use PHP. -### `ynh_add_fpm_config` will use the files conf/php-fpm.conf -### If you're not using these lines: -### - You can remove these files in conf/. -### - Remove the section "BACKUP THE PHP-FPM CONFIGURATION" in the backup script -### - Remove also the section "REMOVE PHP-FPM CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE PHP-FPM CONFIGURATION" in the restore script -### With the reload at the end of the script. -### - And the section "PHP-FPM CONFIGURATION" in the upgrade script - -# Create a dedicated php-fpm7.2 config -ynh_add_fpm_config --phpversion="7.2" - #================================================= # SPECIFIC SETUP #================================================= diff --git a/scripts/restore b/scripts/restore index ce3d628..b7180f8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -50,8 +50,8 @@ test ! -d $final_path \ # REINSTALL DEPENDENCIES #================================================= -# Define and install dependencies -ynh_install_php --phpversion="7.2" --package="$pkg_dependencies" +# Create a dedicated php-fpm7.2 config +ynh_add_fpm_config --phpversion="7.2" --package="$pkg_dependencies" #================================================= # RESTORE THE NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index e8c2d38..a24e1b7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,9 +86,8 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." - -ynh_install_php --phpversion="7.2" --package="$pkg_dependencies" +# Create a dedicated php-fpm7.2 config +ynh_add_fpm_config --phpversion="7.2" --package="$pkg_dependencies" #================================================= # INSTALL COMPOSER @@ -120,14 +119,6 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Upgrading php-fpm configuration..." - -#================================================= -# PHP-FPM 7.2 CONFIGURATION -#================================================= - -# Create a dedicated php-fpm7.2 config -ynh_add_fpm_config --phpversion="7.2" - # setup application config # Get admin email email=$(ynh_user_get_info $admin 'mail')