From 97c59e6c8b1e30c715d1e7cafb9a2a9699823dba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 14:40:36 +0200 Subject: [PATCH] Upgrade to version 4.2.1 (#415) * Upgrade to v4.2.1 * Auto-update README * Remove deprecated StdErr syslog * Change line_match for systemd streaming --------- Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot Co-authored-by: Tagadda <36127788+Tagadda@users.noreply.github.com> --- README.md | 3 +-- README_fr.md | 3 +-- conf/app.src | 4 ++-- conf/mastodon-sidekiq.service | 1 - conf/mastodon-streaming.service | 1 - conf/mastodon-web.service | 1 - manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 10 files changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 22d8f00..829ac52 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. -**Shipped version:** 4.2.0~ynh1 +**Shipped version:** 4.2.1~ynh1 **Demo:** https://joinmastodon.org/ @@ -74,7 +74,6 @@ Log-out from YunoHost's portal doesn't log out from Mastodon. See https://github * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 086d648..1a81d1b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. -**Version incluse :** 4.2.0~ynh1 +**Version incluse :** 4.2.1~ynh1 **Démo :** https://joinmastodon.org/ @@ -80,7 +80,6 @@ Se déconnecter depuis le portail YunoHost ne vous déconnecte pas de Mastodon. * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs diff --git a/conf/app.src b/conf/app.src index 641cd1f..24ad348 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v4.2.0.tar.gz -SOURCE_SUM=97c6bd9eb31efb96b10f78f6397de93a49ce8fa7237ffd73c7407f5d9692dfea +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v4.2.1.tar.gz +SOURCE_SUM=08e3668ddf44774d7165af4dbe1ee3deae1e935481d7365fc7df0a00af806836 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index 40591c0..25a46fb 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -14,7 +14,6 @@ Environment="__YNH_RUBY_LOAD_PATH__" ExecStart=__FINALPATH__/live/bin/bundle exec sidekiq -c 25 TimeoutSec=15 Restart=always -StandardError=syslog # Sandboxing options to harden security # Depending on specificities of your service/app, you may need to tweak these diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service index 4122b02..c88e0fa 100644 --- a/conf/mastodon-streaming.service +++ b/conf/mastodon-streaming.service @@ -13,7 +13,6 @@ Environment="__YNH_NODE_LOAD_PATH__" ExecStart=__YNH_NODE__ ./streaming TimeoutSec=15 Restart=always -StandardError=syslog # Sandboxing options to harden security # Depending on specificities of your service/app, you may need to tweak these diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service index 5d22974..334233b 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -14,7 +14,6 @@ ExecStart=__FINALPATH__/live/bin/bundle exec puma -C config/puma.rb ExecReload=/bin/kill -SIGUSR1 $MAINPID TimeoutSec=15 Restart=always -StandardError=syslog # Sandboxing options to harden security # Depending on specificities of your service/app, you may need to tweak these diff --git a/manifest.json b/manifest.json index fae5b7e..437f16c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network", "fr": "Réseau social libre et fédéré" }, - "version": "4.2.0~ynh1", + "version": "4.2.1~ynh1", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 6df1759..1ac067f 100644 --- a/scripts/install +++ b/scripts/install @@ -251,7 +251,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" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index be0e019..a03e3ba 100644 --- a/scripts/restore +++ b/scripts/restore @@ -159,7 +159,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" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 9be5f2f..e770e63 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -301,7 +301,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" #================================================= # RELOAD NGINX