From 84bb76083cada8c00eaa457cf1714b24cd4dfd0c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 4 Jan 2024 19:30:50 +0100 Subject: [PATCH 1/5] First admin should be Owner --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1ac067f..d5976f7 100644 --- a/scripts/install +++ b/scripts/install @@ -194,7 +194,7 @@ pushd "$final_path/live" ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:setup --quiet ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Admin > /dev/null + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner > /dev/null ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts modify "$admin" --approve popd From 2baaffafdce32e13b23b14ae5e77dbbf78c26b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:13:58 +0100 Subject: [PATCH 2/5] fix linter --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e770e63..e041939 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,9 +66,9 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=${app}-web --action="stop" --log_path=systemd --line_match="Stopped" -ynh_systemd_action --service_name=${app}-sidekiq --action="stop" --log_path=systemd --line_match="Stopped" -ynh_systemd_action --service_name=${app}-streaming --action="stop" --log_path=systemd --line_match="Stopped" +ynh_systemd_action --service_name=${app}-web --action="stop" --log_path=systemd +ynh_systemd_action --service_name=${app}-sidekiq --action="stop" --log_path=systemd +ynh_systemd_action --service_name=${app}-streaming --action="stop" --log_path=systemd #================================================= # ENSURE DOWNWARD COMPATIBILITY From 6428e9d222487859f89124fafd86a8790e84f50e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jan 2024 14:22:38 +0100 Subject: [PATCH 3/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7be81fc..957ff92 100644 --- a/manifest.json +++ b/manifest.json @@ -30,7 +30,7 @@ } ], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": true, "services": [ From 178cfbb94390af3916ce210b5e95721b7d9349f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 13 Jan 2024 16:40:43 +0100 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 957ff92..fa67fbe 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.3~ynh1", + "version": "4.2.3~ynh2", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From e3d0328771596de59563dcd7794948b2c2249096 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 13 Jan 2024 15:40:48 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b9edd3a..f9a4744 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.3~ynh1 +**Shipped version:** 4.2.3~ynh2 **Demo:** https://joinmastodon.org/ diff --git a/README_fr.md b/README_fr.md index f1a4cf7..f062c5f 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.3~ynh1 +**Version incluse :** 4.2.3~ynh2 **Démo :** https://joinmastodon.org/