From d4b4469708d1ab4747fc4cb9c99515a9d47c3a77 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 00:52:09 +0200 Subject: [PATCH] Upgrade to version 2023.08.26 (#146) * Upgrade to v2023.08.26 * Auto-update README * Update line_match for streaming service start * Update line_match for streaming service start * Update line_match for streaming service start * Bump upgrade from earlier version test --------- Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++-- conf/app.src | 6 +++--- manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 34d53d2..e949785 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.08.14~ynh1 +**Shipped version:** 2023.08.26~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index ee29f1f..a6b979b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.08.14~ynh1 +**Version incluse :** 2023.08.26~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). diff --git a/check_process b/check_process index 668daea..36224c5 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 2022.04.28~ynh1 - upgrade=1 from_commit=614380eeeefce3bab1b3106990138f526f950664 + # 2023.07.22~ynh1 + upgrade=1 from_commit=b1e08ae563686ecd0bfb98eba1537cb1e76d264d backup_restore=1 multi_instance=0 port_already_use=0 diff --git a/conf/app.src b/conf/app.src index 27a2a5a..f56daee 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/86ba8d3e14955841fed45b49114e06b7a3473ba4.tar.gz -SOURCE_SUM=6d5d6339895f1cdd802bfdd5335410cc040cc0e0f2ad7684da67fc2ed1942eb9 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/efb1888320e56d12bef2b43059cb6d5f275140d0.tar.gz +SOURCE_SUM=c83e52d8051b0d415b66f3ed3d1155910b1a96661824008d33d22df8fea5f12f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=86ba8d3e14955841fed45b49114e06b7a3473ba4.tar.gz +SOURCE_FILENAME=efb1888320e56d12bef2b43059cb6d5f275140d0.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index c3eecfe..a22b6f1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.08.14~ynh1", + "version": "2023.08.26~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 4bea9c1..b56b309 100644 --- a/scripts/install +++ b/scripts/install @@ -277,7 +277,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on" ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded" -ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening" +ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Streaming API now listening on" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index e8a3c9e..766d553 100644 --- a/scripts/restore +++ b/scripts/restore @@ -153,7 +153,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on" ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded" -ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening" +ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Streaming API now listening on" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index f7d73a9..6083778 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -374,7 +374,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on" ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded" -ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening" +ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Streaming API now listening on" #================================================= # RELOAD NGINX