From e827fbe4a89c0dcd51308457e5f00a9fc5dcc18b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 21 Aug 2025 10:42:04 +0200 Subject: convert to helpers v2.1 and try to upgrade to latest version --- scripts/remove | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'scripts/remove') diff --git a/scripts/remove b/scripts/remove index c8ca3a3..85423a4 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source ynh_add_swap source /usr/share/yunohost/helpers @@ -15,44 +9,44 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +ynh_script_progression "Removing system configurations related to $app..." # 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-web" >/dev/null +if ynh_hide_warnings yunohost service status "$app-web" >/dev/null then - ynh_script_progression --message="Removing $app-web service integration..." --weight=1 + ynh_script_progression "Removing $app-web service integration..." yunohost service remove "$app-web" fi -if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null +if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null then - ynh_script_progression --message="Removing $app-sidekiq service integration..." --weight=1 + ynh_script_progression "Removing $app-sidekiq service integration..." yunohost service remove "$app-sidekiq" fi -if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null +if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null then - ynh_script_progression --message="Removing $app-streaming service integration..." --weight=1 + ynh_script_progression "Removing $app-streaming service integration..." yunohost service remove "$app-streaming" fi # Remove the dedicated systemd config -ynh_remove_systemd_config --service="$app-web" -ynh_remove_systemd_config --service="$app-sidekiq" -ynh_remove_systemd_config --service="$app-streaming" +ynh_config_remove_systemd"$app-web" +ynh_config_remove_systemd"$app-sidekiq" +ynh_config_remove_systemd"$app-streaming" # Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx # Remove a cron file -ynh_secure_remove --file="/etc/cron.d/$app" +ynh_safe_rm "/etc/cron.d/$app" # Remote logrotate config -ynh_remove_logrotate +ynh_config_remove_logrotate # Remove metapackage and its dependencies -ynh_remove_ruby -ynh_remove_nodejs +ynh_ruby_remove +ynh_nodejs_remove # Remove swap ynh_del_swap @@ -61,4 +55,4 @@ ynh_del_swap # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" -- cgit v1.2.3-70-g09d2 From 28f4fc68fcfd4991d7e427c479a3583544cec60a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Aug 2025 07:55:20 +0200 Subject: fix remove services --- scripts/remove | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/remove') diff --git a/scripts/remove b/scripts/remove index 85423a4..297786f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -31,9 +31,9 @@ then fi # Remove the dedicated systemd config -ynh_config_remove_systemd"$app-web" -ynh_config_remove_systemd"$app-sidekiq" -ynh_config_remove_systemd"$app-streaming" +ynh_config_remove_systemd "$app-web" +ynh_config_remove_systemd "$app-sidekiq" +ynh_config_remove_systemd "$app-streaming" # Remove the dedicated NGINX config ynh_config_remove_nginx -- cgit v1.2.3-70-g09d2 From 9d34db18df100918645c7f839d2d62bf44fc4d2d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:12:59 +0200 Subject: cleaning --- manifest.toml | 1 - scripts/_common.sh | 4 ++-- scripts/remove | 14 +++----------- scripts/restore | 4 ---- scripts/upgrade | 13 ++++--------- tests.toml | 2 +- 6 files changed, 10 insertions(+), 28 deletions(-) (limited to 'scripts/remove') diff --git a/manifest.toml b/manifest.toml index 7f0b634..3575af5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,7 +25,6 @@ architectures = "all" multi_instance = true ldap = true - sso = false disk = "2G" diff --git a/scripts/_common.sh b/scripts/_common.sh index 182e391..acc9c4b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,8 +5,8 @@ #================================================= memory_needed="2560" -ruby_version=3.4.5 -nodejs_version=20 +ruby_version="3.4.5" +nodejs_version="20" case $YNH_ARCH in amd64) diff --git a/scripts/remove b/scripts/remove index 297786f..d2c0cb5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,26 +7,18 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SYSTEMD SERVICE -#================================================= ynh_script_progression "Removing system configurations related to $app..." # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_hide_warnings yunohost service status "$app-web" >/dev/null -then - ynh_script_progression "Removing $app-web service integration..." +if ynh_hide_warnings yunohost service status "$app-web" >/dev/null; then yunohost service remove "$app-web" fi -if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null -then - ynh_script_progression "Removing $app-sidekiq service integration..." +if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null; then yunohost service remove "$app-sidekiq" fi -if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null -then - ynh_script_progression "Removing $app-streaming service integration..." +if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null; then yunohost service remove "$app-streaming" fi diff --git a/scripts/restore b/scripts/restore index 0becd6c..03f0dce 100644 --- a/scripts/restore +++ b/scripts/restore @@ -5,8 +5,6 @@ source ../settings/scripts/_common.sh source ../settings/scripts/ynh_add_swap source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -61,8 +59,6 @@ popd #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= ynh_script_progression "Restoring system configurations related to $app..." ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 769b47c..3b8f6e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,11 +16,11 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= - ynh_script_progression "Stopping $app's systemd service..." - ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" - ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" - ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log + +ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" +ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" +ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -54,12 +54,9 @@ ynh_script_progression "Upgrading Ruby and NodeJS..." ynh_ruby_install ynh_nodejs_install -#================================================= -# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= - ynh_script_progression "Upgrading source files..." # Download, check integrity, uncompress and patch the source from manifest.toml @@ -114,8 +111,6 @@ ynh_config_add --template="cron" --destination="/etc/cron.d/$app" mkdir -p /var/log/$app ynh_config_add_logrotate -#================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) #================================================= # UPDATE A CONFIG FILE #================================================= diff --git a/tests.toml b/tests.toml index b34a3e6..588a0db 100644 --- a/tests.toml +++ b/tests.toml @@ -21,5 +21,5 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1" + #test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1" test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1" -- cgit v1.2.3-70-g09d2