From 1e658b58976e5bdaa7ff8121147facf3ed491cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Mar 2023 22:22:02 +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 2efedf0..bf9fe91 100755 --- a/scripts/install +++ b/scripts/install @@ -28,9 +28,9 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/documize" #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +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 1583ae3..8d1a182 100755 --- a/scripts/restore +++ b/scripts/restore @@ -22,9 +22,11 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/documize" #================================================= -# RESTORE THE NGINX CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the NGINX web server 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 7e82e0f..9211760 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,9 +41,9 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/documize" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config