aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTagada <36127788+Tagadda@users.noreply.github.com>2024-08-13 19:06:01 +0200
committerGitHub <noreply@github.com>2024-08-13 19:06:01 +0200
commit26f29342f21e11579f4c8a5195fd8a9f40a78156 (patch)
tree66ebab4a34853816f1b7bf28c689873f4f90d91f
parentc3c4416b24aaec57b8ec04f7479be84033259134 (diff)
parent1859c45ccc1d0a396cd8ca0f3e343a439d10c6a1 (diff)
downloadmastodon_ynh-26f29342f21e11579f4c8a5195fd8a9f40a78156.tar.gz
mastodon_ynh-26f29342f21e11579f4c8a5195fd8a9f40a78156.tar.bz2
mastodon_ynh-26f29342f21e11579f4c8a5195fd8a9f40a78156.zip
Merge pull request #461 from YunoHost-Apps/testing
Testing
-rw-r--r--ALL_README.md1
-rw-r--r--README.md2
-rw-r--r--README_es.md2
-rw-r--r--README_eu.md2
-rw-r--r--README_fr.md2
-rw-r--r--README_gl.md2
-rw-r--r--README_id.md51
-rw-r--r--README_zh_Hans.md2
-rw-r--r--manifest.toml2
-rw-r--r--scripts/_common.sh2
-rw-r--r--scripts/upgrade5
11 files changed, 65 insertions, 8 deletions
diff --git a/ALL_README.md b/ALL_README.md
index 152f2e7..4ed64dd 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -5,4 +5,5 @@
- [Irakurri README euskaraz](README_eu.md)
- [Lire le README en français](README_fr.md)
- [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
- [阅读中文(简体)的 README](README_zh_Hans.md)
diff --git a/README.md b/README.md
index 7a68222..91218f3 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ 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.10~ynh1
+**Shipped version:** 4.2.10~ynh2
**Demo:** <https://joinmastodon.org/>
diff --git a/README_es.md b/README_es.md
index fac22ee..1d34971 100644
--- a/README_es.md
+++ b/README_es.md
@@ -20,7 +20,7 @@ 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.
-**Versión actual:** 4.2.10~ynh1
+**Versión actual:** 4.2.10~ynh2
**Demo:** <https://joinmastodon.org/>
diff --git a/README_eu.md b/README_eu.md
index ee7a875..ddaecde 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -20,7 +20,7 @@ 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.
-**Paketatutako bertsioa:** 4.2.10~ynh1
+**Paketatutako bertsioa:** 4.2.10~ynh2
**Demoa:** <https://joinmastodon.org/>
diff --git a/README_fr.md b/README_fr.md
index 6d67908..4e104a8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -21,7 +21,7 @@ C'est une alternative décentralisée aux plates-formes commerciales comme Twitt
Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales.
-**Version incluse :** 4.2.10~ynh1
+**Version incluse :** 4.2.10~ynh2
**Démo :** <https://joinmastodon.org/>
diff --git a/README_gl.md b/README_gl.md
index 7a671a0..76aa551 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -20,7 +20,7 @@ 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.
-**Versión proporcionada:** 4.2.10~ynh1
+**Versión proporcionada:** 4.2.10~ynh2
**Demo:** <https://joinmastodon.org/>
diff --git a/README_id.md b/README_id.md
new file mode 100644
index 0000000..438b7e1
--- /dev/null
+++ b/README_id.md
@@ -0,0 +1,51 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Mastodon untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg)
+
+[![Pasang Mastodon dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Mastodon secara cepat dan mudah pada server YunoHost.*
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+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.
+
+
+**Versi terkirim:** 4.2.10~ynh2
+
+**Demo:** <https://joinmastodon.org/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Mastodon](./doc/screenshots/mastodon.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://joinmastodon.org/>
+- Dokumentasi admin resmi: <https://docs.joinmastodon.org/>
+- Depot kode aplikasi hulu: <https://github.com/mastodon/mastodon>
+- Gudang YunoHost: <https://apps.yunohost.org/app/mastodon>
+- Laporkan bug: <https://github.com/YunoHost-Apps/mastodon_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index c394b4e..aaa45fc 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -20,7 +20,7 @@ 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.
-**分发版本:** 4.2.10~ynh1
+**分发版本:** 4.2.10~ynh2
**演示:** <https://joinmastodon.org/>
diff --git a/manifest.toml b/manifest.toml
index 51fd473..c1e6e6f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Mastodon"
description.en = "Libre and federated social network"
description.fr = "Réseau social libre et fédéré"
-version = "4.2.10~ynh1"
+version = "4.2.10~ynh2"
maintainers = ["Tagada"]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 4049d21..a2ba0b8 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
#=================================================
memory_needed="2560"
-ruby_version=3.2.2
+ruby_version=3.2.3
nodejs_version=20
# Workaround for Mastodon on Bullseye
diff --git a/scripts/upgrade b/scripts/upgrade
index 2dd3d32..c889e65 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,6 +39,11 @@ if [[ -z "${service:-}" ]]; then
service="$app-web.service"
ynh_app_setting_set --app="$app" --key=service --value="$service"
fi
+# Set `redis_namespace` settings
+if [[ -z "${redis_namespace:-}" ]]; then
+ redis_namespace=${app}_production
+ ynh_app_setting_set --app="$app" --key=redis_namespace --value="$redis_namespace"
+fi
# Remove previous added repository
ynh_remove_extra_repo