From 18d131313d9681a8147c54814a6f052d86448c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 4 Mar 2023 18:52:16 +0100 Subject: [PATCH] Fix --- scripts/install | 9 ++------- scripts/remove | 10 ++++------ scripts/upgrade | 9 ++------- tests.toml | 6 ++++++ 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/scripts/install b/scripts/install index bd759cf..2a6f144 100755 --- a/scripts/install +++ b/scripts/install @@ -37,18 +37,13 @@ ynh_app_setting_set --app=$app --key=fingerprint --value=$fingerprint chown -R $app:$app "/etc/opt/simplex" #================================================= -# SETUP SYSTEMD +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port" #================================================= diff --git a/scripts/remove b/scripts/remove index 13f4668..33d032c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -23,17 +23,15 @@ then fi #================================================= -# STOP AND REMOVE SERVICE +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 +# REMOVE SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE APP MAIN DIR -#================================================= - # Remove the app directory securely ynh_secure_remove --file="/etc/opt/simplex" diff --git a/scripts/upgrade b/scripts/upgrade index 4e4a699..686667e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,18 +57,13 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# 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 systemd config ynh_add_systemd_config -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port" #================================================= diff --git a/tests.toml b/tests.toml index cbbeef1..884ddd6 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,9 @@ test_format = 1.0 [default] + + # ------------ + # Tests to run + # ------------ + + exclude = ["install.change_url"]