diff options
| author | eric_G <46165813+ericgaspar@users.noreply.github.com> | 2024-01-13 16:41:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-13 16:41:06 +0100 |
| commit | e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13 (patch) | |
| tree | 55bbd8bc5ca92cda61f8b1365afd78a1b92c0662 | |
| parent | 9622cf0c39889cd32ed820f2c91ed5ab323a211b (diff) | |
| parent | e3d0328771596de59563dcd7794948b2c2249096 (diff) | |
| download | mastodon_ynh-e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13.tar.gz mastodon_ynh-e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13.tar.bz2 mastodon_ynh-e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13.zip | |
Merge pull request #428 from YunoHost-Apps/testing
Testing
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README_fr.md | 2 | ||||
| -rw-r--r-- | manifest.json | 4 | ||||
| -rw-r--r-- | scripts/install | 2 | ||||
| -rw-r--r-- | scripts/upgrade | 6 |
5 files changed, 8 insertions, 8 deletions
@@ -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/ diff --git a/manifest.json b/manifest.json index 7be81fc..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", @@ -30,7 +30,7 @@ } ], "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": true, "services": [ 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 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 |