diff --git a/scripts/install b/scripts/install index 5811cdd..fd71b55 100644 --- a/scripts/install +++ b/scripts/install @@ -11,12 +11,6 @@ source /usr/share/yunohost/helpers # INITIALIZE AND STORE SETTINGS #================================================= -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" -ynh_app_setting_set --app="$app" --key=fpm_footprint --value="$fpm_footprint" -ynh_app_setting_set --app="$app" --key=fpm_free_footprint --value="$fpm_free_footprint" -ynh_app_setting_set --app="$app" --key=fpm_usage --value="$fpm_usage" #================================================= # CONFIGURING A POSTGRESQL DATABASE @@ -67,7 +61,7 @@ ynh_exec_as "$app" "php$phpversion" "$install_dir/daemon.php" config --username= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/restore b/scripts/restore index 022cfba..bc38387 100644 --- a/scripts/restore +++ b/scripts/restore @@ -34,7 +34,7 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion +ynh_add_fpm_config ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index b41fa4f..3a2386a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,29 +14,6 @@ ynh_script_progression --message="Stopping $app's systemd service..." ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app="$app" --key=fpm_footprint --value="$fpm_footprint" -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app="$app" --key=fpm_free_footprint --value="$fpm_free_footprint" -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app="$app" --key=fpm_usage --value="$fpm_usage" -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -78,7 +55,7 @@ ynh_exec_warn_less ynh_composer_exec --commands="movim:migrate --quiet" ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage="$fpm_usage" --footprint="$fpm_footprint" +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config