From ea6116045da907894e7189c8b4ec3df111976286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Nov 2023 18:55:43 +0100 Subject: [PATCH] cleaning --- scripts/install | 4 ++-- scripts/remove | 5 +++-- scripts/restore | 6 ++++-- scripts/upgrade | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 8596a94..1cb50d7 100755 --- a/scripts/install +++ b/scripts/install @@ -22,9 +22,9 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/gotify" #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 57324bf..4c29204 100755 --- a/scripts/remove +++ b/scripts/remove @@ -10,10 +10,11 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# STANDARD REMOVE +# REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SERVICE INTEGRATION IN YUNOHOST +# REMOVE SYSTEMD SERVICE #================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null diff --git a/scripts/restore b/scripts/restore index 2cf3388..3cc256f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,9 +28,11 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=20 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE SYSTEMD +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 742ebd3..0f85547 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -52,9 +52,9 @@ chmod 400 "$install_dir/config.yml" chown $app:$app "$install_dir/config.yml" #================================================= -# SETUP SYSTEMD +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config