diff options
| author | eric_G <46165813+ericgaspar@users.noreply.github.com> | 2025-09-01 11:39:26 +0200 |
|---|---|---|
| committer | eric_G <46165813+ericgaspar@users.noreply.github.com> | 2025-09-01 11:39:26 +0200 |
| commit | f2e5d633339667d75bd9a764e056150af0054072 (patch) | |
| tree | 50fad3e6c05cfb27c2c3866200756283f1de6113 | |
| parent | 0114f2f9b79a03241cffeff6bb18182938dda414 (diff) | |
| parent | edbf9871a19fd30634d86e7ff41d4f33b92521d4 (diff) | |
| download | mastodon_ynh-f2e5d633339667d75bd9a764e056150af0054072.tar.gz mastodon_ynh-f2e5d633339667d75bd9a764e056150af0054072.tar.bz2 mastodon_ynh-f2e5d633339667d75bd9a764e056150af0054072.zip | |
Merge branch 'testing' into ldpreload
| -rw-r--r-- | manifest.toml | 1 | ||||
| -rw-r--r-- | scripts/_common.sh | 4 | ||||
| -rw-r--r-- | scripts/remove | 14 | ||||
| -rw-r--r-- | scripts/restore | 4 | ||||
| -rw-r--r-- | scripts/upgrade | 13 | ||||
| -rw-r--r-- | tests.toml | 2 |
6 files changed, 10 insertions, 28 deletions
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 7ac14ba..9044c9c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,5 +5,5 @@ #================================================= memory_needed="2560" -ruby_version=3.4.5 -nodejs_version=20 +ruby_version="3.4.5" +nodejs_version="22" 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 c6939f6..cbb2d2c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,8 +6,6 @@ source ../settings/scripts/ynh_add_swap source /usr/share/yunohost/helpers #================================================= -# STANDARD RESTORATION STEPS -#================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression "Restoring the app main directory..." @@ -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 8fa7f0f..9b3c8db 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 @@ -55,11 +55,8 @@ 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 @@ -115,8 +112,6 @@ mkdir -p /var/log/$app ynh_config_add_logrotate #================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) -#================================================= # UPDATE A CONFIG FILE #================================================= ynh_script_progression "Updating a config file..." @@ -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" |