diff --git a/scripts/install b/scripts/install index 4c263969..ef9b9e32 100644 --- a/scripts/install +++ b/scripts/install @@ -106,9 +106,8 @@ ynh_print_info "Configuring php-fpm..." # Create a dedicated php-fpm config ynh_add_fpm_config --phpversion="7.2" -#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released -mv "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf" -systemctl reload php7.0-fpm +#Workaround waiting 'ynh_add_fpm_config --phpversion='' released +cp "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf" systemctl reload php7.2-fpm #================================================= diff --git a/scripts/remove b/scripts/remove index 5784d04e..7bea232a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -47,14 +47,13 @@ ynh_remove_nginx_config #================================================= ynh_print_info "Removing php-fpm configuration" -#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released -mv "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf" -systemctl reload php7.2-fpm -systemctl reload php7.0-fpm - # Remove the dedicated php-fpm config ynh_remove_fpm_config +#Workaround waiting 'ynh_add_fpm_config --phpversion='' released +ynh_secure_remove "/etc/php/7.2/fpm/pool.d/$app.conf" +systemctl reload php7.2-fpm + #================================================= # REMOVE DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 43e89c46..a8299a8f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -116,16 +116,11 @@ ynh_system_user_create "$app" #================================================= ynh_print_info "Upgrading php-fpm configuration..." -mv -f "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf" -systemctl reload php7.0-fpm -systemctl reload php7.2-fpm - # Create a dedicated php-fpm config ynh_add_fpm_config --phpversion="7.2" -#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released -mv -f "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf" -systemctl reload php7.0-fpm +#Workaround waiting 'ynh_add_fpm_config --phpversion='' released +cp -f "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf" systemctl reload php7.2-fpm #================================================= @@ -153,9 +148,7 @@ pushd "$final_path" php7.2 artisan horizon:purge popd - - -ynh_backup_if_checksum_is_different "$final_path/CONFIG_FILE" +ynh_backup_if_checksum_is_different "$final_path/.env" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum "$final_path/.env"