aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTagada <36127788+Tagadda@users.noreply.github.com>2022-11-26 13:09:52 +0100
committerGitHub <noreply@github.com>2022-11-26 13:09:52 +0100
commitc5d524c3c5026f0159bead63f1f3d273d89f228c (patch)
tree5a12f7810eb103d5141ad4d016763bec0eaaf538
parentcd1f90297bcc490b5e22c93d45898104a412b483 (diff)
parentd7f729919c4ab99d6317001b926b49f65c0e6629 (diff)
downloadmastodon_ynh-c5d524c3c5026f0159bead63f1f3d273d89f228c.tar.gz
mastodon_ynh-c5d524c3c5026f0159bead63f1f3d273d89f228c.tar.bz2
mastodon_ynh-c5d524c3c5026f0159bead63f1f3d273d89f228c.zip
Merge pull request #350 from YunoHost-Apps/testing
Upgrade to v4.0.2
-rw-r--r--README.md3
-rw-r--r--README_fr.md3
-rw-r--r--conf/app.src4
-rw-r--r--manifest.json2
-rw-r--r--scripts/install2
5 files changed, 6 insertions, 8 deletions
diff --git a/README.md b/README.md
index f48ae39..6378ff2 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,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:** 3.5.3~ynh4
-
+**Shipped version:** 4.0.2~ynh1
**Demo:** https://joinmastodon.org/
diff --git a/README_fr.md b/README_fr.md
index d0dbfaa..1c14e9f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -18,8 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
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 :** 3.5.3~ynh4
-
+**Version incluse :** 4.0.2~ynh1
**Démo :** https://joinmastodon.org/
diff --git a/conf/app.src b/conf/app.src
index b957ecb..dbf6513 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v3.5.3.tar.gz
-SOURCE_SUM=ad6f71419538a9427669010735bcf029e9e2f455b6728d498b27bf38285bf3f8
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v4.0.2.tar.gz
+SOURCE_SUM=70a4d9dcd9b746f6e9ced9b567ee5ad81e530cfaccb7f471259b917c20166309
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index d63a402..d5abdd0 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": "3.5.3~ynh4",
+ "version": "4.0.2~ynh1",
"url": "https://github.com/mastodon/mastodon",
"upstream": {
"license": "AGPL-3.0-or-later",
diff --git a/scripts/install b/scripts/install
index fbeb73d..6df1759 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=Admin > /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