From ab86edf8335bce70c8c288a14e85750bc084a904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Nov 2023 14:37:54 +0100 Subject: [PATCH] fix --- scripts/install | 4 ++-- scripts/remove | 6 ++---- scripts/restore | 4 +++- scripts/upgrade | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 314e02d..92ddb67 100644 --- a/scripts/install +++ b/scripts/install @@ -47,9 +47,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config diff --git a/scripts/remove b/scripts/remove index 0d69e80..0f5e210 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,11 +10,9 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# STANDARD REMOVE +# REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the app-specific logrotate config ynh_remove_logrotate diff --git a/scripts/restore b/scripts/restore index 6d962ba..51b6b31 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,10 +38,12 @@ else ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql fi +#================================================= +# RESTORE SYSTEM CONFIGURATIONS #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 4df9a54..e76e67f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,9 +49,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config