From 755ab9078169eb77d4708d672c211603e657959d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 1 Oct 2024 03:44:29 +0200 Subject: Upgrade sources - `main` v4.2.13: https://github.com/mastodon/mastodon/releases/tag/v4.2.13 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 318d01d..d41094e 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.12~ynh1" +version = "4.2.13~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.2.12.tar.gz" - sha256 = "8fba0e4cc74233bee77752217673295ec4e32587abc2c9ae8967497147e691e5" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.2.13.tar.gz" + sha256 = "a8f2576ac97bc8ab39e952408f5fcdb11aa8b15f0b988dab6147a8e5aa8b112d" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 25ef6f4bb538d7c2ecbf33517ddccb323b7340d3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 1 Oct 2024 03:44:33 +0200 Subject: Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 4 ++-- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 README_nl.md diff --git a/ALL_README.md b/ALL_README.md index e3c80d2..df3708b 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,5 +6,6 @@ - [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) +- [Lees de README in het Nederlands](README_nl.md) - [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index c676435..998a4bd 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.12~ynh1 +**Shipped version:** 4.2.13~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 7bcdc9e..54ccf3c 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.12~ynh1 +**Versión actual:** 4.2.13~ynh1 **Demo:** @@ -38,7 +38,7 @@ It is a decentralized alternative to commercial platforms like Twitter and avoid ## Información para desarrolladores -Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing +Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). Para probar la rama `testing`, sigue asÍ: diff --git a/README_eu.md b/README_eu.md index effc978..c478d4a 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.12~ynh1 +**Paketatutako bertsioa:** 4.2.13~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index c55aa91..8cd7ffd 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.12~ynh1 +**Version incluse :** 4.2.13~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index cec6ed7..b0d4b60 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.12~ynh1 +**Versión proporcionada:** 4.2.13~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index a90e2d5..3ecefa5 100644 --- a/README_id.md +++ b/README_id.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 terkirim:** 4.2.12~ynh1 +**Versi terkirim:** 4.2.13~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md new file mode 100644 index 0000000..2b97a1b --- /dev/null +++ b/README_nl.md @@ -0,0 +1,51 @@ + + +# Mastodon voor Yunohost + +[![Integratieniveau](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) + +[![Mastodon met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) + +*[Deze README in een andere taal lezen.](./ALL_README.md)* + +> *Met dit pakket kun je Mastodon snel en eenvoudig op een YunoHost-server installeren.* +> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.* + +## Overzicht + +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. + + +**Geleverde versie:** 4.2.13~ynh1 + +**Demo:** + +## Schermafdrukken + +![Schermafdrukken van Mastodon](./doc/screenshots/mastodon.png) + +## Documentatie en bronnen + +- Officiele website van de app: +- Officiele beheerdersdocumentatie: +- Upstream app codedepot: +- YunoHost-store: +- Meld een bug: + +## Ontwikkelaarsinformatie + +Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). + +Om de `testing`-branch uit te proberen, ga als volgt te werk: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +of +sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +``` + +**Verdere informatie over app-packaging:** diff --git a/README_ru.md b/README_ru.md index 3c1e86f..00ab7c2 100644 --- a/README_ru.md +++ b/README_ru.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.12~ynh1 +**Поставляемая версия:** 4.2.13~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 83aaddb..e9476cb 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.12~ynh1 +**分发版本：** 4.2.13~ynh1 **演示：** -- cgit v1.2.3-70-g09d2 From 9b6200b04a1d6e52c5e26fc36b980b102d1c94b5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Dec 2024 13:56:57 +0100 Subject: Upgrade sources - `main` v4.3.2: https://github.com/mastodon/mastodon/releases/tag/v4.3.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index d41094e..7dfed7b 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.13~ynh1" +version = "4.3.2~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.2.13.tar.gz" - sha256 = "a8f2576ac97bc8ab39e952408f5fcdb11aa8b15f0b988dab6147a8e5aa8b112d" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.2.tar.gz" + sha256 = "d4ad908ad4793c6df761438cf6ee51d08a28cd74a1554bcc0f71718f88cce0ac" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From f42e0062f5ed2fc63443111c811fbfb2f3ad0700 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Dec 2024 13:57:02 +0100 Subject: Auto-update READMEs --- ALL_README.md | 1 + README.md | 6 ++++-- README_es.md | 6 ++++-- README_eu.md | 6 ++++-- README_fr.md | 6 ++++-- README_gl.md | 6 ++++-- README_id.md | 6 ++++-- README_nl.md | 6 ++++-- README_pl.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README_ru.md | 6 ++++-- README_zh_Hans.md | 6 ++++-- 11 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 README_pl.md diff --git a/ALL_README.md b/ALL_README.md index df3708b..c93d620 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -7,5 +7,6 @@ - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [Lees de README in het Nederlands](README_nl.md) +- [Przeczytaj README w języku polski](README_pl.md) - [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 998a4bd..44f02f4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ It shall NOT be edited by hand. # Mastodon for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Working status](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Integration level](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Working status](https://apps.yunohost.org/badge/state/mastodon) +![Maintenance status](https://apps.yunohost.org/badge/maintained/mastodon) [![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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.13~ynh1 +**Shipped version:** 4.3.2~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 54ccf3c..dc43ee9 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,9 @@ No se debe editar a mano. # Mastodon para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Nivel de integración](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Estado funcional](https://apps.yunohost.org/badge/state/mastodon) +![Estado En Mantención](https://apps.yunohost.org/badge/maintained/mastodon) [![Instalar Mastodon con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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.13~ynh1 +**Versión actual:** 4.3.2~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index c478d4a..aa24037 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,9 @@ EZ editatu eskuz. # Mastodon YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Integrazio maila](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Funtzionamendu egoera](https://apps.yunohost.org/badge/state/mastodon) +![Mantentze egoera](https://apps.yunohost.org/badge/maintained/mastodon) [![Instalatu Mastodon YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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.13~ynh1 +**Paketatutako bertsioa:** 4.3.2~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8cd7ffd..507032a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,9 @@ Il NE doit PAS être modifié à la main. # Mastodon pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Niveau d’intégration](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Statut du fonctionnement](https://apps.yunohost.org/badge/state/mastodon) +![Statut de maintenance](https://apps.yunohost.org/badge/maintained/mastodon) [![Installer Mastodon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -21,7 +23,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.13~ynh1 +**Version incluse :** 4.3.2~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index b0d4b60..57994fa 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,9 @@ NON debe editarse manualmente. # Mastodon para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Nivel de integración](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Estado de funcionamento](https://apps.yunohost.org/badge/state/mastodon) +![Estado de mantemento](https://apps.yunohost.org/badge/maintained/mastodon) [![Instalar Mastodon con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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.13~ynh1 +**Versión proporcionada:** 4.3.2~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 3ecefa5..5b134f5 100644 --- a/README_id.md +++ b/README_id.md @@ -5,7 +5,9 @@ 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) +[![Tingkat integrasi](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Status kerja](https://apps.yunohost.org/badge/state/mastodon) +![Status pemeliharaan](https://apps.yunohost.org/badge/maintained/mastodon) [![Pasang Mastodon dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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 terkirim:** 4.2.13~ynh1 +**Versi terkirim:** 4.3.2~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index 2b97a1b..c5439b8 100644 --- a/README_nl.md +++ b/README_nl.md @@ -5,7 +5,9 @@ Hij mag NIET handmatig aangepast worden. # Mastodon voor Yunohost -[![Integratieniveau](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Integratieniveau](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Mate van functioneren](https://apps.yunohost.org/badge/state/mastodon) +![Onderhoudsstatus](https://apps.yunohost.org/badge/maintained/mastodon) [![Mastodon met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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. -**Geleverde versie:** 4.2.13~ynh1 +**Geleverde versie:** 4.3.2~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md new file mode 100644 index 0000000..b876f93 --- /dev/null +++ b/README_pl.md @@ -0,0 +1,53 @@ + + +# Mastodon dla YunoHost + +[![Poziom integracji](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Status działania](https://apps.yunohost.org/badge/state/mastodon) +![Status utrzymania](https://apps.yunohost.org/badge/maintained/mastodon) + +[![Zainstaluj Mastodon z YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) + +*[Przeczytaj plik README w innym języku.](./ALL_README.md)* + +> *Ta aplikacja pozwala na szybką i prostą instalację Mastodon na serwerze YunoHost.* +> *Jeżeli nie masz YunoHost zapoznaj się z [poradnikiem](https://yunohost.org/install) instalacji.* + +## Przegląd + +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. + + +**Dostarczona wersja:** 4.3.2~ynh1 + +**Demo:** + +## Zrzuty ekranu + +![Zrzut ekranu z Mastodon](./doc/screenshots/mastodon.png) + +## Dokumentacja i zasoby + +- Oficjalna strona aplikacji: +- Oficjalna dokumentacja dla administratora: +- Repozytorium z kodem źródłowym: +- Sklep YunoHost: +- Zgłaszanie błędów: + +## Informacje od twórców + +Wyślij swój pull request do [gałęzi `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). + +Aby wypróbować gałąź `testing` postępuj zgodnie z instrukcjami: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +lub +sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +``` + +**Więcej informacji o tworzeniu paczek aplikacji:** diff --git a/README_ru.md b/README_ru.md index 00ab7c2..649ec1b 100644 --- a/README_ru.md +++ b/README_ru.md @@ -5,7 +5,9 @@ # Mastodon для YunoHost -[![Уровень интеграции](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![Уровень интеграции](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Состояние работы](https://apps.yunohost.org/badge/state/mastodon) +![Состояние сопровождения](https://apps.yunohost.org/badge/maintained/mastodon) [![Установите Mastodon с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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.13~ynh1 +**Поставляемая версия:** 4.3.2~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index e9476cb..9b2aff4 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,9 @@ # YunoHost 上的 Mastodon -[![集成程度](https://dash.yunohost.org/integration/mastodon.svg)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) +[![集成程度](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![工作状态](https://apps.yunohost.org/badge/state/mastodon) +![维护状态](https://apps.yunohost.org/badge/maintained/mastodon) [![使用 YunoHost 安装 Mastodon](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) @@ -20,7 +22,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.13~ynh1 +**分发版本：** 4.3.2~ynh1 **演示：** -- cgit v1.2.3-70-g09d2 From 3b0275ba5b773feca70ed92db8c8f240e93107ce Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 28 Dec 2024 01:29:20 +0100 Subject: Implement yarn 4.5, new active_record_encryption and mastodon default services --- conf/.env.production.sample | 21 ++++++++++++---- conf/mastodon-sidekiq.service | 36 +++++++++++++++------------- conf/mastodon-streaming.service | 36 +++++++++++++++------------- conf/mastodon-web.service | 36 +++++++++++++++------------- manifest.toml | 7 +----- scripts/_common.sh | 2 +- scripts/install | 53 +++++++++++++++++++++++++---------------- scripts/upgrade | 26 ++++++++++++++++---- tests.toml | 4 ++++ 9 files changed, 135 insertions(+), 86 deletions(-) diff --git a/conf/.env.production.sample b/conf/.env.production.sample index 7005b5d..2abf6c5 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -1,5 +1,5 @@ # This is a sample configuration file. You can generate your configuration -# with the `rake mastodon:setup` interactive setup wizard, but to customize +# with the `bundle exec rails mastodon:setup` interactive setup wizard, but to customize # your setup even further, you'll need to edit it manually. This sample does # not demonstrate all available configuration options. Please look at # https://docs.joinmastodon.org/admin/config/ for the full documentation. @@ -41,14 +41,25 @@ ES_ENABLED=false # Secrets # ------- -# Make sure to use `rake secret` to generate secrets +# Make sure to use `bundle exec rails secret` to generate secrets # ------- SECRET_KEY_BASE=__SECRET_KEY_BASE__ OTP_SECRET=__OTP_SECRET__ +# Encryption secrets +# ------------------ +# Must be available (and set to same values) for all server processes +# These are private/secret values, do not share outside hosting environment +# Use `bin/rails db:encryption:init` to generate fresh secrets +# Do not change these secrets once in use, as this would cause data loss and other issues +# ------------------ +ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=__ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY__ +ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=__ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT__ +ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=__ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY__ + # Web Push # -------- -# Generate with `rake mastodon:webpush:generate_vapid_key` +# Generate with `bundle exec rails mastodon:webpush:generate_vapid_key` # -------- VAPID_PRIVATE_KEY=__VAPID_PRIVATE_KEY__ VAPID_PUBLIC_KEY=__VAPID_PUBLIC_KEY__ @@ -104,5 +115,5 @@ LDAP_TLS_NO_VERIFY=true # Make sure to modify the scheduling of ip_cleanup_scheduler in config/sidekiq.yml # to be less than daily if you lower IP_RETENTION_PERIOD below two days (172800). # ----------------------- -IP_RETENTION_PERIOD=1209600 -SESSION_RETENTION_PERIOD=1209600 +IP_RETENTION_PERIOD=31556952 +SESSION_RETENTION_PERIOD=31556952 diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index 14bd592..ad5a6a0 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -6,10 +6,10 @@ After=network.target Type=simple User=__APP__ WorkingDirectory=__INSTALL_DIR__/live -Environment="__LD_PRELOAD__" Environment="RAILS_ENV=production" Environment="DB_POOL=25" Environment="MALLOC_ARENA_MAX=2" +Environment="__LD_PRELOAD__" Environment="__YNH_RUBY_LOAD_PATH__" ExecStart=__INSTALL_DIR__/live/bin/bundle exec sidekiq -c 25 TimeoutSec=15 @@ -17,22 +17,26 @@ Restart=always StandardOutput=append:/var/log/__APP__/__APP__-sidekiq.log StandardError=inherit -# Sandboxing options to harden security -# Depending on specificities of your service/app, you may need to tweak these -# .. but this should be a good baseline -# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html -NoNewPrivileges=no -PrivateTmp=yes -PrivateDevices=yes -RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK -RestrictNamespaces=yes -RestrictRealtime=yes -DevicePolicy=closed +# Proc filesystem +# Capabilities +# Security +NoNewPrivileges=true +# Sandboxing ProtectSystem=full -ProtectControlGroups=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -LockPersonality=yes +PrivateTmp=true +PrivateDevices=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +RestrictAddressFamilies=AF_INET +RestrictAddressFamilies=AF_INET6 +RestrictAddressFamilies=AF_NETLINK +RestrictAddressFamilies=AF_UNIX +RestrictNamespaces=true +LockPersonality=true +RestrictRealtime=true +DevicePolicy=closed +# System Call Filtering SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap # Denying access to capabilities that should not be relevant for webapps diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service index f63945e..f29e527 100644 --- a/conf/mastodon-streaming.service +++ b/conf/mastodon-streaming.service @@ -1,5 +1,5 @@ [Unit] -Description=__APP__-streaming +Description=__APP__-streaming on port __PORT_STREAM_ After=network.target [Service] @@ -16,22 +16,26 @@ Restart=always StandardOutput=append:/var/log/__APP__/__APP__-streaming.log StandardError=inherit -# Sandboxing options to harden security -# Depending on specificities of your service/app, you may need to tweak these -# .. but this should be a good baseline -# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html -NoNewPrivileges=yes -PrivateTmp=yes -PrivateDevices=yes -RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK -RestrictNamespaces=yes -RestrictRealtime=yes -DevicePolicy=closed +# Proc filesystem +# Capabilities +# Security +NoNewPrivileges=true +# Sandboxing ProtectSystem=full -ProtectControlGroups=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -LockPersonality=yes +PrivateTmp=true +PrivateDevices=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +RestrictAddressFamilies=AF_INET +RestrictAddressFamilies=AF_INET6 +RestrictAddressFamilies=AF_NETLINK +RestrictAddressFamilies=AF_UNIX +RestrictNamespaces=true +LockPersonality=true +RestrictRealtime=true +DevicePolicy=closed +# System Call Filtering SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap # Denying access to capabilities that should not be relevant for webapps diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service index 133fc3b..4804b16 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -6,9 +6,9 @@ After=network.target Type=simple User=__APP__ WorkingDirectory=__INSTALL_DIR__/live -Environment="__LD_PRELOAD__" Environment="RAILS_ENV=production" Environment="PORT=__PORT_WEB__" +Environment="__LD_PRELOAD__" Environment="__YNH_RUBY_LOAD_PATH__" ExecStart=__INSTALL_DIR__/live/bin/bundle exec puma -C config/puma.rb ExecReload=/bin/kill -SIGUSR1 $MAINPID @@ -17,22 +17,26 @@ Restart=always StandardOutput=append:/var/log/__APP__/__APP__-web.log StandardError=inherit -# Sandboxing options to harden security -# Depending on specificities of your service/app, you may need to tweak these -# .. but this should be a good baseline -# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html -NoNewPrivileges=yes -PrivateTmp=yes -PrivateDevices=yes -RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK -RestrictNamespaces=yes -RestrictRealtime=yes -DevicePolicy=closed +# Proc filesystem +# Capabilities +# Security +NoNewPrivileges=true +# Sandboxing ProtectSystem=full -ProtectControlGroups=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -LockPersonality=yes +PrivateTmp=true +PrivateDevices=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +RestrictAddressFamilies=AF_INET +RestrictAddressFamilies=AF_INET6 +RestrictAddressFamilies=AF_NETLINK +RestrictAddressFamilies=AF_UNIX +RestrictNamespaces=true +LockPersonality=true +RestrictRealtime=true +DevicePolicy=closed +# System Call Filtering SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap # Denying access to capabilities that should not be relevant for webapps diff --git a/manifest.toml b/manifest.toml index 7dfed7b..1c4aefd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -75,12 +75,7 @@ ram.runtime = "500M" stream.default = 4000 [resources.apt] - packages = "imagemagick, ffmpeg, libpq-dev, libxml2-dev, libxslt1-dev, file, git, git-core, g++, libprotobuf-dev, protobuf-compiler, pkg-config, gcc, autoconf, bison, build-essential, libssl-dev, libyaml-dev, libreadline6-dev, zlib1g-dev, libncurses5-dev, libffi-dev, libgdbm6, libgdbm-dev, redis-tools, redis-server, rsync, postgresql, postgresql-contrib, libidn11-dev, libicu-dev, libjemalloc-dev, curl, apt-transport-https" - - [resources.apt.extras.yarn] - repo = "deb https://dl.yarnpkg.com/debian/ stable main" - key = "https://dl.yarnpkg.com/debian/pubkey.gpg" - packages = "yarn" + packages = "imagemagick, ffmpeg, libvips-tools, libpq-dev, libxml2-dev, libxslt1-dev, file, git, git-core, g++, libprotobuf-dev, protobuf-compiler, pkg-config, gcc, autoconf, bison, build-essential, libssl-dev, libyaml-dev, libreadline6-dev, zlib1g-dev, libncurses5-dev, libffi-dev, libgdbm6, libgdbm-dev, redis-tools, redis-server, rsync, postgresql, postgresql-contrib, libidn11-dev, libicu-dev, libjemalloc-dev, curl, apt-transport-https" [resources.database] type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index a2ba0b8..d354663 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= memory_needed="2560" -ruby_version=3.2.3 +ruby_version=3.3.5 nodejs_version=20 # Workaround for Mastodon on Bullseye diff --git a/scripts/install b/scripts/install index 1385a30..dfcbb27 100644 --- a/scripts/install +++ b/scripts/install @@ -69,22 +69,19 @@ ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base otp_secret=$(ynh_string_random --length=128) ynh_app_setting_set --app="$app" --key=otp_secret --value="$otp_secret" -# We need rake to build vapid keys, we generate them later once the app is installed +# We need bundle exec rails to build vapid keys, we generate them later once the app is installed vapid_private_key="" vapid_public_key="" +# We need `bin/rails db:encryption:init` to generate fresh secrets, we generate them later once the app is installed +active_record_encryption_deterministic_key="" +active_record_encryption_key_derivation_salt="" +active_record_encryption_primary_key="" + ynh_add_config --template=".env.production.sample" --destination="$config" chmod 400 "$config" chown $app:$app "$config" -ynh_replace_string --match_string="registrations_mode: 'open'" --replace_string="registrations_mode: 'none'" --target_file="$install_dir/live/config/settings.yml" -ynh_replace_string --match_string="min_invite_role: 'admin'" --replace_string="min_invite_role: 'none'" --target_file="$install_dir/live/config/settings.yml" - -ynh_store_file_checksum --file="$install_dir/live/config/settings.yml" - -chmod 400 "$install_dir/live/config/settings.yml" -chown $app:$app "$install_dir/live/config/settings.yml" - #================================================= # BUILD APP #================================================= @@ -97,31 +94,45 @@ pushd "$install_dir/live" ynh_gem install bundler --no-document ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true + ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) - # Building assets ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile --production --network-timeout 600000 + env $ynh_node_load_PATH corepack enable + echo Y | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --immutable echo "SAFETY_ASSURED=1">> $config - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --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 # Generate vapid keys - 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 - # Create the first admin user - 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/bundle exec rails mastodon:webpush:generate_vapid_key > vapid_key.txt + # Generate active record encryption + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:encryption:init > active_record_encryption.txt popd -# Re-generate config with vapid keys -vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$install_dir/live/key.txt") +# Re-generate config with vapid keys and active record encryption +vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$install_dir/live/vapid_key.txt") ynh_app_setting_set --app="$app" --key=vapid_private_key --value="$vapid_private_key" -vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "$install_dir/live/key.txt") +vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "$install_dir/live/vapid_key.txt") ynh_app_setting_set --app="$app" --key=vapid_public_key --value="$vapid_public_key" -ynh_secure_remove --file="$install_dir/live/key.txt" +ynh_secure_remove --file="$install_dir/live/vapid_key.txt" +active_record_encryption_deterministic_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") +ynh_app_setting_set --app="$app" --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" +active_record_encryption_key_derivation_salt=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=\K.+" "$install_dir/live/active_record_encryption.txt") +ynh_app_setting_set --app="$app" --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" +active_record_encryption_primary_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") +ynh_app_setting_set --app="$app" --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" +ynh_secure_remove --file="$install_dir/live/active_record_encryption.txt" ynh_delete_file_checksum --file="$config" ynh_add_config --template=".env.production.sample" --destination="$config" chmod 400 "$config" chown $app:$app "$config" +pushd "$install_dir/live" + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --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 + # Create the first admin user + 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 approve "$admin" > /dev/null +popd + #================================================= # SYSTEM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c889e65..10e37c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,9 +124,9 @@ pushd "$install_dir/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs - ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile --production --network-timeout 600000 - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile + env $ynh_node_load_PATH corepack enable + echo Y | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --immutable popd chown "$app:www-data" "$install_dir" @@ -163,6 +163,21 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Updating a config file..." --weight=1 +if ynh_compare_current_package_version --comparison lt --version "4.3.2~ynh1"; then + pushd "$install_dir/live" + ynh_use_ruby + # Generate active record encryption + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:encryption:init > active_record_encryption.txt + active_record_encryption_deterministic_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") + ynh_app_setting_set --app="$app" --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" + active_record_encryption_key_derivation_salt=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=\K.+" "$install_dir/live/active_record_encryption.txt") + ynh_app_setting_set --app="$app" --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" + active_record_encryption_primary_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") + ynh_app_setting_set --app="$app" --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" + ynh_secure_remove --file="$install_dir/live/active_record_encryption.txt" + popd +fi + language="$(echo $language | head -c 2)" ynh_add_config --template=".env.production.sample" --destination="$config" @@ -177,8 +192,9 @@ ynh_script_progression --message="Applying migrations..." --weight=1 pushd "$install_dir/live" ynh_use_ruby - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl cache clear + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean --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 popd #================================================= diff --git a/tests.toml b/tests.toml index c1f2069..c983544 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + test_format = 1.0 [default] @@ -24,3 +26,5 @@ test_format = 1.0 test_upgrade_from.43504e6.args.is_public=1 test_upgrade_from.43504e6.args.admin="john" test_upgrade_from.43504e6.args.language="fr_FR" + + test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "Upgrade from 4.2.13~ynh1" -- cgit v1.2.3-70-g09d2 From ae23701d446549aca12e5e3bd31a8dc15a65ff86 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 Dec 2024 17:21:26 +0100 Subject: Update mastodon-streaming.service --- conf/mastodon-streaming.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service index f29e527..963a316 100644 --- a/conf/mastodon-streaming.service +++ b/conf/mastodon-streaming.service @@ -1,5 +1,5 @@ [Unit] -Description=__APP__-streaming on port __PORT_STREAM_ +Description=__APP__-streaming on port __PORT_STREAM__ After=network.target [Service] -- cgit v1.2.3-70-g09d2 From d3cb68ee5ca50f2d4edb7183a36dcaf47b731df1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 Dec 2024 18:29:59 +0100 Subject: fix missing ld_preload --- scripts/_common.sh | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d354663..0dbcc15 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,30 +8,23 @@ memory_needed="2560" ruby_version=3.3.5 nodejs_version=20 -# Workaround for Mastodon on Bullseye -# See https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463 -if [ "$(lsb_release --codename --short)" = "bullseye" ]; -then - case $YNH_ARCH in - amd64) - ld_preload="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so" - ;; - arm64) - ld_preload="LD_PRELOAD=/usr/lib/aarch64-linux-gnu/libjemalloc.so" - ;; - armhf) - ld_preload="LD_PRELOAD=/usr/lib/arm-linux-gnueabihf/libjemalloc.so" - ;; - armel) - ld_preload="LD_PRELOAD=/usr/lib/arm-linux-gnueabi/libjemalloc.so" - ;; - i386) - ld_preload="LD_PRELOAD=/usr/lib/i386-linux-gnu/libjemalloc.so" - ;; - esac -else - ld_preload="" -fi +case $YNH_ARCH in + amd64) + ld_preload="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so" + ;; + arm64) + ld_preload="LD_PRELOAD=/usr/lib/aarch64-linux-gnu/libjemalloc.so" + ;; + armhf) + ld_preload="LD_PRELOAD=/usr/lib/arm-linux-gnueabihf/libjemalloc.so" + ;; + armel) + ld_preload="LD_PRELOAD=/usr/lib/arm-linux-gnueabi/libjemalloc.so" + ;; + i386) + ld_preload="LD_PRELOAD=/usr/lib/i386-linux-gnu/libjemalloc.so" + ;; +esac #================================================= # PERSONAL HELPERS -- cgit v1.2.3-70-g09d2 From e071d0c0df548925a54385c809d52f916bbe74e2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 29 Dec 2024 22:51:19 +0100 Subject: Fix upgrade --- scripts/upgrade | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 10e37c9..531c766 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,18 +97,12 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression "Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 +# Download, check integrity, uncompress and patch the source from manifest.toml +ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system .env.production" - # Download Mastodon - ynh_setup_source --dest_dir="$install_dir/live" --keep="public/system/" - - chmod 750 "$install_dir" - chmod -R o-rwx "$install_dir" - chown -R $app:www-data "$install_dir" -fi +chown -R $app:www-data "$install_dir" #================================================= # BUILD ASSETS @@ -193,7 +187,6 @@ ynh_script_progression --message="Applying migrations..." --weight=1 pushd "$install_dir/live" ynh_use_ruby ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean --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 popd -- cgit v1.2.3-70-g09d2 From 66959014e9b5981410ac638926c214e866bfb2ef Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 30 Dec 2024 21:23:19 +0100 Subject: Revert "Fix upgrade" This reverts commit e071d0c0df548925a54385c809d52f916bbe74e2. --- scripts/upgrade | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 531c766..10e37c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,12 +97,18 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from manifest.toml -ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system .env.production" +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading source files..." --weight=1 -chown -R $app:www-data "$install_dir" + # Download Mastodon + ynh_setup_source --dest_dir="$install_dir/live" --keep="public/system/" + + chmod 750 "$install_dir" + chmod -R o-rwx "$install_dir" + chown -R $app:www-data "$install_dir" +fi #================================================= # BUILD ASSETS @@ -187,6 +193,7 @@ ynh_script_progression --message="Applying migrations..." --weight=1 pushd "$install_dir/live" ynh_use_ruby ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean --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 popd -- cgit v1.2.3-70-g09d2 From 0595ab38e0e46f6e2b68a1404f3bb5ce8528a5d0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 30 Dec 2024 21:24:21 +0100 Subject: Update upgrade --- scripts/upgrade | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 10e37c9..f7a3573 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,8 +102,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Download Mastodon - ynh_setup_source --dest_dir="$install_dir/live" --keep="public/system/" + # Download, check integrity, uncompress and patch the source from manifest.toml + ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system .env.production" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -193,7 +193,6 @@ ynh_script_progression --message="Applying migrations..." --weight=1 pushd "$install_dir/live" ynh_use_ruby ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean --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 popd -- cgit v1.2.3-70-g09d2 From bb8806561506f6d2827e2e00138294470362aa72 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Jan 2025 00:11:03 +0100 Subject: Upgrade sources - `main` v4.3.3: https://github.com/mastodon/mastodon/releases/tag/v4.3.3 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1c4aefd..ea5ce77 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.3.2~ynh1" +version = "4.3.3~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.2.tar.gz" - sha256 = "d4ad908ad4793c6df761438cf6ee51d08a28cd74a1554bcc0f71718f88cce0ac" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.3.tar.gz" + sha256 = "d8c68d2bce5826fa4fbb52b598ad8a95354baaf517cb972eeb4e8600d94de33b" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 1ac8f07a4752c90d71b56a20d6d689fc607365dd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Jan 2025 00:11:05 +0100 Subject: Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 44f02f4..e816b95 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,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.3.2~ynh1 +**Shipped version:** 4.3.3~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index dc43ee9..15d8688 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,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.3.2~ynh1 +**Versión actual:** 4.3.3~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index aa24037..fc636a8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,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.3.2~ynh1 +**Paketatutako bertsioa:** 4.3.3~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 507032a..07001e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.3.2~ynh1 +**Version incluse :** 4.3.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 57994fa..eb812bb 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,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.3.2~ynh1 +**Versión proporcionada:** 4.3.3~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 5b134f5..32ecfd4 100644 --- a/README_id.md +++ b/README_id.md @@ -22,7 +22,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 terkirim:** 4.3.2~ynh1 +**Versi terkirim:** 4.3.3~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index c5439b8..71314ed 100644 --- a/README_nl.md +++ b/README_nl.md @@ -22,7 +22,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. -**Geleverde versie:** 4.3.2~ynh1 +**Geleverde versie:** 4.3.3~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index b876f93..7a9a951 100644 --- a/README_pl.md +++ b/README_pl.md @@ -22,7 +22,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. -**Dostarczona wersja:** 4.3.2~ynh1 +**Dostarczona wersja:** 4.3.3~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 649ec1b..356067a 100644 --- a/README_ru.md +++ b/README_ru.md @@ -22,7 +22,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.3.2~ynh1 +**Поставляемая версия:** 4.3.3~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 9b2aff4..c948ffe 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,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.3.2~ynh1 +**分发版本：** 4.3.3~ynh1 **演示：** -- cgit v1.2.3-70-g09d2 From 1367e0d4a497e34cd2e178be708e8d6377f14e45 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 28 Feb 2025 00:11:44 +0100 Subject: Upgrade sources - `main` v4.3.4: https://github.com/mastodon/mastodon/releases/tag/v4.3.4 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ea5ce77..ad78e29 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.3.3~ynh1" +version = "4.3.4~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.3.tar.gz" - sha256 = "d8c68d2bce5826fa4fbb52b598ad8a95354baaf517cb972eeb4e8600d94de33b" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.4.tar.gz" + sha256 = "8e6c234f2ca4420e7eb64e8a655d1d46a61c2532afde97f7579d9fd29989b1d5" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 09ec6f9e74be8a85535b6dde07545ed100f2b156 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 28 Feb 2025 00:11:46 +0100 Subject: Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e816b95..f3e9e2b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,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.3.3~ynh1 +**Shipped version:** 4.3.4~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 15d8688..18c1e2e 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,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.3.3~ynh1 +**Versión actual:** 4.3.4~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index fc636a8..329f280 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,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.3.3~ynh1 +**Paketatutako bertsioa:** 4.3.4~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 07001e4..5118edb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.3.3~ynh1 +**Version incluse :** 4.3.4~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index eb812bb..1d6919c 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,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.3.3~ynh1 +**Versión proporcionada:** 4.3.4~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 32ecfd4..ffa81e5 100644 --- a/README_id.md +++ b/README_id.md @@ -22,7 +22,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 terkirim:** 4.3.3~ynh1 +**Versi terkirim:** 4.3.4~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index 71314ed..56de3fa 100644 --- a/README_nl.md +++ b/README_nl.md @@ -22,7 +22,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. -**Geleverde versie:** 4.3.3~ynh1 +**Geleverde versie:** 4.3.4~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 7a9a951..323ef3f 100644 --- a/README_pl.md +++ b/README_pl.md @@ -22,7 +22,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. -**Dostarczona wersja:** 4.3.3~ynh1 +**Dostarczona wersja:** 4.3.4~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 356067a..03eb6bf 100644 --- a/README_ru.md +++ b/README_ru.md @@ -22,7 +22,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.3.3~ynh1 +**Поставляемая версия:** 4.3.4~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index c948ffe..62a1232 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,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.3.3~ynh1 +**分发版本：** 4.3.4~ynh1 **演示：** -- cgit v1.2.3-70-g09d2 From 53febffe81745b05259bf25347dec7ab95396efb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 11 Mar 2025 00:14:16 +0100 Subject: Upgrade sources - `main` v4.3.5: https://github.com/mastodon/mastodon/releases/tag/v4.3.5 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ad78e29..dfd7f83 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.3.4~ynh1" +version = "4.3.5~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.4.tar.gz" - sha256 = "8e6c234f2ca4420e7eb64e8a655d1d46a61c2532afde97f7579d9fd29989b1d5" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.5.tar.gz" + sha256 = "c24f388d92c1bae4de9c834c3b2cece13111178dd450e85d7fc5eaf7dbaf8d20" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 2f407b5e31a60ab8621dd6e845fd10862cdb1634 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 11 Mar 2025 00:14:19 +0100 Subject: Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index f3e9e2b..94fdd1c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,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.3.4~ynh1 +**Shipped version:** 4.3.5~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 18c1e2e..2ad5ad0 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,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.3.4~ynh1 +**Versión actual:** 4.3.5~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 329f280..b6a7d2f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,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.3.4~ynh1 +**Paketatutako bertsioa:** 4.3.5~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 5118edb..0bd66ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.3.4~ynh1 +**Version incluse :** 4.3.5~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 1d6919c..820ad1b 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,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.3.4~ynh1 +**Versión proporcionada:** 4.3.5~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index ffa81e5..d405a1e 100644 --- a/README_id.md +++ b/README_id.md @@ -22,7 +22,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 terkirim:** 4.3.4~ynh1 +**Versi terkirim:** 4.3.5~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index 56de3fa..fe77309 100644 --- a/README_nl.md +++ b/README_nl.md @@ -22,7 +22,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. -**Geleverde versie:** 4.3.4~ynh1 +**Geleverde versie:** 4.3.5~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 323ef3f..c7e6900 100644 --- a/README_pl.md +++ b/README_pl.md @@ -22,7 +22,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. -**Dostarczona wersja:** 4.3.4~ynh1 +**Dostarczona wersja:** 4.3.5~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 03eb6bf..f8eb4b4 100644 --- a/README_ru.md +++ b/README_ru.md @@ -22,7 +22,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.3.4~ynh1 +**Поставляемая версия:** 4.3.5~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 62a1232..b97e307 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,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.3.4~ynh1 +**分发版本：** 4.3.5~ynh1 **演示：** -- cgit v1.2.3-70-g09d2 From 226747a9d47d5716eefc2a1ea151f883a621765b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Mar 2025 00:17:44 +0100 Subject: Upgrade sources - `main` v4.3.6: https://github.com/mastodon/mastodon/releases/tag/v4.3.6 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index dfd7f83..92ef90d 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.3.5~ynh1" +version = "4.3.6~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.5.tar.gz" - sha256 = "c24f388d92c1bae4de9c834c3b2cece13111178dd450e85d7fc5eaf7dbaf8d20" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.6.tar.gz" + sha256 = "1ea3d54ecd90539e08c1441a6f330a3c1404b42b89d78a52acea9fdcdf713e94" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From bc1e12b9d0564c8019e33395421676dcce985307 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Mar 2025 00:17:46 +0100 Subject: Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 94fdd1c..b22fcca 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,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.3.5~ynh1 +**Shipped version:** 4.3.6~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 2ad5ad0..3404ba9 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,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.3.5~ynh1 +**Versión actual:** 4.3.6~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index b6a7d2f..cbdc556 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,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.3.5~ynh1 +**Paketatutako bertsioa:** 4.3.6~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 0bd66ba..3e22ddd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,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.3.5~ynh1 +**Version incluse :** 4.3.6~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 820ad1b..9f9f9d7 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,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.3.5~ynh1 +**Versión proporcionada:** 4.3.6~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index d405a1e..68489b5 100644 --- a/README_id.md +++ b/README_id.md @@ -22,7 +22,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 terkirim:** 4.3.5~ynh1 +**Versi terkirim:** 4.3.6~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index fe77309..5bc003a 100644 --- a/README_nl.md +++ b/README_nl.md @@ -22,7 +22,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. -**Geleverde versie:** 4.3.5~ynh1 +**Geleverde versie:** 4.3.6~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index c7e6900..921dddc 100644 --- a/README_pl.md +++ b/README_pl.md @@ -22,7 +22,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. -**Dostarczona wersja:** 4.3.5~ynh1 +**Dostarczona wersja:** 4.3.6~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index f8eb4b4..e7fdae5 100644 --- a/README_ru.md +++ b/README_ru.md @@ -22,7 +22,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.3.5~ynh1 +**Поставляемая версия:** 4.3.6~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index b97e307..ffd2e07 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,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.3.5~ynh1 +**分发版本：** 4.3.6~ynh1 **演示：** -- cgit v1.2.3-70-g09d2 From 16659ed6165f001924d440445f26c6e27c72f0ed Mon Sep 17 00:00:00 2001 From: Matthew Exon Date: Thu, 27 Mar 2025 15:16:15 +0100 Subject: Correct a couple of spelling errors --- doc/PRE_INSTALL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md index cbb9a79..e95a46f 100644 --- a/doc/PRE_INSTALL.md +++ b/doc/PRE_INSTALL.md @@ -1,7 +1,7 @@ ## Important points to read before installing -- **Mastodon** require a dedicated **root domain**, eg. `domaine.tld` or `mastodon.domain.tld`, with no other apps installed on that domain. Due to the federation, **you will not be able to change the domain once installed.** -- The user choosen during the installation is automatically created in Mastodon with admin rights +- **Mastodon** require a dedicated **root domain**, eg. `domain.tld` or `mastodon.domain.tld`, with no other apps installed on that domain. Due to the federation, **you will not be able to change the domain once installed.** +- The user chosen during the installation is automatically created in Mastodon with admin rights - To ensure that your Mastodon instance remains private and that the community is secure, it is important that registrations are closed and verified. We invite you to block remote malicious instances from the administration interface. You can also add text on your home page using the administration interface. ## Using *screen* in case of disconnect -- cgit v1.2.3-70-g09d2 From 9c098f239416c9cb9eba1c7178b6b37ccc6c9b6b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Mar 2025 20:02:08 +0100 Subject: Auto-update READMEs --- ALL_README.md | 2 ++ README_ca.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README_de.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README_es.md | 2 +- README_eu.md | 2 +- 5 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 README_ca.md create mode 100644 README_de.md diff --git a/ALL_README.md b/ALL_README.md index c93d620..7e29ff1 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Llegir el README en català](README_ca.md) +- [Die README in Deutsch lesen](README_de.md) - [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) diff --git a/README_ca.md b/README_ca.md new file mode 100644 index 0000000..d9d651d --- /dev/null +++ b/README_ca.md @@ -0,0 +1,53 @@ + + +# Mastodon per YunoHost + +[![Nivell d'integració](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Estat de funcionament](https://apps.yunohost.org/badge/state/mastodon) +![Estat de manteniment](https://apps.yunohost.org/badge/maintained/mastodon) + +[![Instal·la Mastodon amb YunoHosth](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) + +*[Llegeix aquest README en altres idiomes.](./ALL_README.md)* + +> *Aquest paquet et permet instal·lar Mastodon de forma ràpida i senzilla en un servidor YunoHost.* +> *Si no tens YunoHost, consulta [la guia](https://yunohost.org/install) per saber com instal·lar-lo.* + +## Visió general + +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ó inclosa:** 4.3.6~ynh1 + +**Demo:** + +## Captures de pantalla + +![Captures de pantalla de Mastodon](./doc/screenshots/mastodon.png) + +## Documentació i recursos + +- Lloc web oficial de l'aplicació: +- Documentació oficial per l'administrador: +- Repositori oficial del codi de l'aplicació: +- Botiga YunoHost: +- Reportar un error: + +## Informació per a desenvolupadors + +Envieu les pull request a la [branca `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). + +Per provar la branca `testing`, procedir com descrit a continuació: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +o +sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +``` + +**Més informació sobre l'empaquetatge d'aplicacions:** diff --git a/README_de.md b/README_de.md new file mode 100644 index 0000000..24b77e1 --- /dev/null +++ b/README_de.md @@ -0,0 +1,53 @@ + + +# Mastodon für YunoHost + +[![Integrations-Level](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +![Funktionsstatus](https://apps.yunohost.org/badge/state/mastodon) +![Wartungsstatus](https://apps.yunohost.org/badge/maintained/mastodon) + +[![Mastodon mit YunoHost installieren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) + +*[Dieses README in anderen Sprachen lesen.](./ALL_README.md)* + +> *Mit diesem Paket können Sie Mastodon schnell und einfach auf einem YunoHost-Server installieren.* +> *Wenn Sie YunoHost nicht haben, lesen Sie bitte [die Anleitung](https://yunohost.org/install), um zu erfahren, wie Sie es installieren.* + +## Übersicht + +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. + + +**Ausgelieferte Version:** 4.3.6~ynh1 + +**Demo:** + +## Bildschirmfotos + +![Bildschirmfotos von Mastodon](./doc/screenshots/mastodon.png) + +## Dokumentation und Ressourcen + +- Offizielle Website der App: +- Offizielle Verwaltungsdokumentation: +- Upstream App Repository: +- YunoHost-Shop: +- Einen Fehler melden: + +## Entwicklerinformationen + +Bitte senden Sie Ihren Pull-Request an den [`testing` branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). + +Um den `testing` Branch auszuprobieren, gehen Sie bitte wie folgt vor: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +oder +sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +``` + +**Weitere Informationen zur App-Paketierung:** diff --git a/README_es.md b/README_es.md index 3404ba9..d067331 100644 --- a/README_es.md +++ b/README_es.md @@ -3,7 +3,7 @@ Este archivo README esta generado automaticamente -# Mastodon para Yunohost +# Mastodon para YunoHost [![Nivel de integración](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) ![Estado funcional](https://apps.yunohost.org/badge/state/mastodon) diff --git a/README_eu.md b/README_eu.md index cbdc556..996ed2b 100644 --- a/README_eu.md +++ b/README_eu.md @@ -42,7 +42,7 @@ It is a decentralized alternative to commercial platforms like Twitter and avoid Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). -`testing` abarra probatzeko, ondorengoa egin: +`testing` abarra probatzeko, honakoa egin: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -- cgit v1.2.3-70-g09d2 From 5ec04c9e302270d328cbed2702c9e9f0a9a01c98 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Apr 2025 00:16:20 +0200 Subject: Upgrade sources - `main` v4.3.7: https://github.com/mastodon/mastodon/releases/tag/v4.3.7 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 92ef90d..fcc7218 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.3.6~ynh1" +version = "4.3.7~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.6.tar.gz" - sha256 = "1ea3d54ecd90539e08c1441a6f330a3c1404b42b89d78a52acea9fdcdf713e94" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.7.tar.gz" + sha256 = "b77590137ae74fde223cdf8ff85baa0e0337207ebe091966e161ce131147c8c2" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 3fdf9bb457ff582ac4151acf064df32e48602568 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Apr 2025 00:17:09 +0200 Subject: Auto-update READMEs --- ALL_README.md | 14 --------- README.md | 64 +++++++++++++++----------------------- README_ca.md | 53 -------------------------------- README_de.md | 53 -------------------------------- README_es.md | 53 -------------------------------- README_eu.md | 53 -------------------------------- README_fr.md | 54 -------------------------------- README_gl.md | 53 -------------------------------- README_id.md | 53 -------------------------------- README_it.md | 92 ------------------------------------------------------- README_nl.md | 53 -------------------------------- README_pl.md | 53 -------------------------------- README_ru.md | 53 -------------------------------- README_zh_Hans.md | 53 -------------------------------- 14 files changed, 25 insertions(+), 729 deletions(-) delete mode 100644 ALL_README.md delete mode 100644 README_ca.md delete mode 100644 README_de.md delete mode 100644 README_es.md delete mode 100644 README_eu.md delete mode 100644 README_fr.md delete mode 100644 README_gl.md delete mode 100644 README_id.md delete mode 100644 README_it.md delete mode 100644 README_nl.md delete mode 100644 README_pl.md delete mode 100644 README_ru.md delete mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md deleted file mode 100644 index 7e29ff1..0000000 --- a/ALL_README.md +++ /dev/null @@ -1,14 +0,0 @@ -# All available README files by language - -- [Read the README in English](README.md) -- [Llegir el README en català](README_ca.md) -- [Die README in Deutsch lesen](README_de.md) -- [Lea el README en español](README_es.md) -- [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) -- [Lees de README in het Nederlands](README_nl.md) -- [Przeczytaj README w języku polski](README_pl.md) -- [Прочитать README на русский](README_ru.md) -- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index b22fcca..9c204a3 100644 --- a/README.md +++ b/README.md @@ -1,53 +1,39 @@ -# Mastodon for YunoHost +

+ Logo of Mastodon + Mastodon, packaged for YunoHost +

-[![Integration level](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Working status](https://apps.yunohost.org/badge/state/mastodon) -![Maintenance status](https://apps.yunohost.org/badge/maintained/mastodon) +Libre and federated social network -[![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) +[![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://joinmastodon.org/) +[![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://joinmastodon.org/) +![Version: 4.3.7~ynh1](https://img.shields.io/badge/Version-4.3.7~ynh1-rgba(0,150,0,1)?style=for-the-badge) -*[Read this README in other languages.](./ALL_README.md)* +
+ + +
-> *This package allows you to install Mastodon quickly and simply on a YunoHost server.* -> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* +## 📦 Developer info -## Overview +🛠️ Upstream Mastodon repository: -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. +Pull request are welcome and should target the [`testing` branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). +The `testing` branch can be tested using: +``` +# fresh install: +sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing -**Shipped version:** 4.3.6~ynh1 - -**Demo:** - -## Screenshots - -![Screenshot of Mastodon](./doc/screenshots/mastodon.png) - -## Documentation and resources - -- Official app website: -- Official admin documentation: -- Upstream app code repository: -- YunoHost Store: -- Report a bug: - -## Developer info - -Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -To try the `testing` branch, please proceed like that: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -or -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +# upgrade an existing install: +sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing ``` -**More info regarding app packaging:** +### 📚 App packaging documentation + +Please see for more information. \ No newline at end of file diff --git a/README_ca.md b/README_ca.md deleted file mode 100644 index d9d651d..0000000 --- a/README_ca.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon per YunoHost - -[![Nivell d'integració](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Estat de funcionament](https://apps.yunohost.org/badge/state/mastodon) -![Estat de manteniment](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Instal·la Mastodon amb YunoHosth](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Llegeix aquest README en altres idiomes.](./ALL_README.md)* - -> *Aquest paquet et permet instal·lar Mastodon de forma ràpida i senzilla en un servidor YunoHost.* -> *Si no tens YunoHost, consulta [la guia](https://yunohost.org/install) per saber com instal·lar-lo.* - -## Visió general - -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ó inclosa:** 4.3.6~ynh1 - -**Demo:** - -## Captures de pantalla - -![Captures de pantalla de Mastodon](./doc/screenshots/mastodon.png) - -## Documentació i recursos - -- Lloc web oficial de l'aplicació: -- Documentació oficial per l'administrador: -- Repositori oficial del codi de l'aplicació: -- Botiga YunoHost: -- Reportar un error: - -## Informació per a desenvolupadors - -Envieu les pull request a la [branca `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Per provar la branca `testing`, procedir com descrit a continuació: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -o -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Més informació sobre l'empaquetatge d'aplicacions:** diff --git a/README_de.md b/README_de.md deleted file mode 100644 index 24b77e1..0000000 --- a/README_de.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon für YunoHost - -[![Integrations-Level](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Funktionsstatus](https://apps.yunohost.org/badge/state/mastodon) -![Wartungsstatus](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Mastodon mit YunoHost installieren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Dieses README in anderen Sprachen lesen.](./ALL_README.md)* - -> *Mit diesem Paket können Sie Mastodon schnell und einfach auf einem YunoHost-Server installieren.* -> *Wenn Sie YunoHost nicht haben, lesen Sie bitte [die Anleitung](https://yunohost.org/install), um zu erfahren, wie Sie es installieren.* - -## Übersicht - -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. - - -**Ausgelieferte Version:** 4.3.6~ynh1 - -**Demo:** - -## Bildschirmfotos - -![Bildschirmfotos von Mastodon](./doc/screenshots/mastodon.png) - -## Dokumentation und Ressourcen - -- Offizielle Website der App: -- Offizielle Verwaltungsdokumentation: -- Upstream App Repository: -- YunoHost-Shop: -- Einen Fehler melden: - -## Entwicklerinformationen - -Bitte senden Sie Ihren Pull-Request an den [`testing` branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Um den `testing` Branch auszuprobieren, gehen Sie bitte wie folgt vor: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -oder -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Weitere Informationen zur App-Paketierung:** diff --git a/README_es.md b/README_es.md deleted file mode 100644 index d067331..0000000 --- a/README_es.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon para YunoHost - -[![Nivel de integración](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Estado funcional](https://apps.yunohost.org/badge/state/mastodon) -![Estado En Mantención](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Instalar Mastodon con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Leer este README en otros idiomas.](./ALL_README.md)* - -> *Este paquete le permite instalarMastodon rapidamente y simplement en un servidor YunoHost.* -> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* - -## Descripción general - -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.3.6~ynh1 - -**Demo:** - -## Capturas - -![Captura de Mastodon](./doc/screenshots/mastodon.png) - -## Documentaciones y recursos - -- Sitio web oficial: -- Documentación administrador oficial: -- Repositorio del código fuente oficial de la aplicación : -- Catálogo YunoHost: -- Reportar un error: - -## Información para desarrolladores - -Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Para probar la rama `testing`, sigue asÍ: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -o -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md deleted file mode 100644 index 996ed2b..0000000 --- a/README_eu.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon YunoHost-erako - -[![Integrazio maila](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Funtzionamendu egoera](https://apps.yunohost.org/badge/state/mastodon) -![Mantentze egoera](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Instalatu Mastodon YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* - -> *Pakete honek Mastodon YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* -> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* - -## Aurreikuspena - -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.3.6~ynh1 - -**Demoa:** - -## Pantaila-argazkiak - -![Mastodon(r)en pantaila-argazkia](./doc/screenshots/mastodon.png) - -## Dokumentazioa eta baliabideak - -- Aplikazioaren webgune ofiziala: -- Administratzaileen dokumentazio ofiziala: -- Jatorrizko aplikazioaren kode-gordailua: -- YunoHost Denda: -- Eman errore baten berri: - -## Garatzaileentzako informazioa - -Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -`testing` abarra probatzeko, honakoa egin: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -edo -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md deleted file mode 100644 index 3e22ddd..0000000 --- a/README_fr.md +++ /dev/null @@ -1,54 +0,0 @@ - - -# Mastodon pour YunoHost - -[![Niveau d’intégration](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Statut du fonctionnement](https://apps.yunohost.org/badge/state/mastodon) -![Statut de maintenance](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Installer Mastodon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Lire le README dans d'autres langues.](./ALL_README.md)* - -> *Ce package vous permet d’installer Mastodon rapidement et simplement sur un serveur YunoHost.* -> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* - -## Vue d’ensemble - -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.3.6~ynh1 - -**Démo :** - -## Captures d’écran - -![Capture d’écran de Mastodon](./doc/screenshots/mastodon.png) - -## Documentations et ressources - -- Site officiel de l’app : -- Documentation officielle de l’admin : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : - -## Informations pour les développeurs - -Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Pour essayer la branche `testing`, procédez comme suit : - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -ou -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md deleted file mode 100644 index 9f9f9d7..0000000 --- a/README_gl.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon para YunoHost - -[![Nivel de integración](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Estado de funcionamento](https://apps.yunohost.org/badge/state/mastodon) -![Estado de mantemento](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Instalar Mastodon con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Le este README en outros idiomas.](./ALL_README.md)* - -> *Este paquete permíteche instalar Mastodon de xeito rápido e doado nun servidor YunoHost.* -> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* - -## Vista xeral - -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.3.6~ynh1 - -**Demo:** - -## Capturas de pantalla - -![Captura de pantalla de Mastodon](./doc/screenshots/mastodon.png) - -## Documentación e recursos - -- Web oficial da app: -- Documentación oficial para admin: -- Repositorio de orixe do código: -- Tenda YunoHost: -- Informar dun problema: - -## Info de desenvolvemento - -Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Para probar a rama `testing`, procede deste xeito: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -ou -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Máis info sobre o empaquetado da app:** diff --git a/README_id.md b/README_id.md deleted file mode 100644 index 68489b5..0000000 --- a/README_id.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon untuk YunoHost - -[![Tingkat integrasi](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Status kerja](https://apps.yunohost.org/badge/state/mastodon) -![Status pemeliharaan](https://apps.yunohost.org/badge/maintained/mastodon) - -[![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.3.6~ynh1 - -**Demo:** - -## Tangkapan Layar - -![Tangkapan Layar pada Mastodon](./doc/screenshots/mastodon.png) - -## Dokumentasi dan sumber daya - -- Website aplikasi resmi: -- Dokumentasi admin resmi: -- Depot kode aplikasi hulu: -- Gudang YunoHost: -- Laporkan bug: - -## 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:** diff --git a/README_it.md b/README_it.md deleted file mode 100644 index 0d18789..0000000 --- a/README_it.md +++ /dev/null @@ -1,92 +0,0 @@ - - -# Mastodon per YunoHost - -[![Livello di integrazione](https://dash.yunohost.org/integration/mastodon.svg)](https://dash.yunohost.org/appci/app/mastodon) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) - -[![Installa Mastodon con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Leggi questo README in altre lingue.](./ALL_README.md)* - -> *Questo pacchetto ti permette di installare Mastodon su un server YunoHost in modo semplice e veloce.* -> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* - -## Panoramica - -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. - -**Versione pubblicata:** 4.2.8~ynh1 - -**Prova:** - -## Screenshot - -![Screenshot di Mastodon](./doc/screenshots/mastodon.png) - -## Attenzione/informazioni importanti - -## Important points to read before installing - -1. **Mastodon** require a dedicated **root domain**, eg. mastodon.domain.tld -1. The user choosen during the installation is automatically created in Mastodon with admin rights -1. At the end of the installation a mail is sent to the user with the automatically generated password -1. It seems important to close the inscriptions for your Mastodon, so that it remains a private body. We invite you to block remote malicious instances from the administration interface. You can also add text on your home page. - -## Configuration - -### Install - -#### Using *screen* in case of disconnect -``` -$ sudo apt-get install screen -$ screen -$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git -``` -Recover after disconnect: -``` -$ screen -d -$ screen -r -``` - -### Update - -#### Using *screen* highly recommended - -`$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug ` - -### Administrate with tootctl - -`$ (cd /var/www/mastodon/live && sudo -u mastodon RAILS_ENV=production PATH=/opt/rbenv/versions/mastodon/bin bin/tootctl --help)` - -## YunoHost specific features - -#### Multi-users support - -LDAP authentication is activated. All YunoHost users can authenticate. - -Log-out from YunoHost's portal doesn't log out from Mastodon. See https://github.com/YunoHost/issues/issues/501 - -## Documentazione e risorse - -- Sito web ufficiale dell’app: -- Documentazione ufficiale per gli amministratori: -- Repository upstream del codice dell’app: -- Store di YunoHost: -- Segnala un problema: - -## Informazioni per sviluppatori - -Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Per provare la branch di `testing`, si prega di procedere in questo modo: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -o -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Maggiori informazioni riguardo il pacchetto di quest’app:** diff --git a/README_nl.md b/README_nl.md deleted file mode 100644 index 5bc003a..0000000 --- a/README_nl.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon voor Yunohost - -[![Integratieniveau](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Mate van functioneren](https://apps.yunohost.org/badge/state/mastodon) -![Onderhoudsstatus](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Mastodon met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Deze README in een andere taal lezen.](./ALL_README.md)* - -> *Met dit pakket kun je Mastodon snel en eenvoudig op een YunoHost-server installeren.* -> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.* - -## Overzicht - -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. - - -**Geleverde versie:** 4.3.6~ynh1 - -**Demo:** - -## Schermafdrukken - -![Schermafdrukken van Mastodon](./doc/screenshots/mastodon.png) - -## Documentatie en bronnen - -- Officiele website van de app: -- Officiele beheerdersdocumentatie: -- Upstream app codedepot: -- YunoHost-store: -- Meld een bug: - -## Ontwikkelaarsinformatie - -Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Om de `testing`-branch uit te proberen, ga als volgt te werk: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -of -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Verdere informatie over app-packaging:** diff --git a/README_pl.md b/README_pl.md deleted file mode 100644 index 921dddc..0000000 --- a/README_pl.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon dla YunoHost - -[![Poziom integracji](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Status działania](https://apps.yunohost.org/badge/state/mastodon) -![Status utrzymania](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Zainstaluj Mastodon z YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Przeczytaj plik README w innym języku.](./ALL_README.md)* - -> *Ta aplikacja pozwala na szybką i prostą instalację Mastodon na serwerze YunoHost.* -> *Jeżeli nie masz YunoHost zapoznaj się z [poradnikiem](https://yunohost.org/install) instalacji.* - -## Przegląd - -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. - - -**Dostarczona wersja:** 4.3.6~ynh1 - -**Demo:** - -## Zrzuty ekranu - -![Zrzut ekranu z Mastodon](./doc/screenshots/mastodon.png) - -## Dokumentacja i zasoby - -- Oficjalna strona aplikacji: -- Oficjalna dokumentacja dla administratora: -- Repozytorium z kodem źródłowym: -- Sklep YunoHost: -- Zgłaszanie błędów: - -## Informacje od twórców - -Wyślij swój pull request do [gałęzi `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Aby wypróbować gałąź `testing` postępuj zgodnie z instrukcjami: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -lub -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Więcej informacji o tworzeniu paczek aplikacji:** diff --git a/README_ru.md b/README_ru.md deleted file mode 100644 index e7fdae5..0000000 --- a/README_ru.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# Mastodon для YunoHost - -[![Уровень интеграции](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![Состояние работы](https://apps.yunohost.org/badge/state/mastodon) -![Состояние сопровождения](https://apps.yunohost.org/badge/maintained/mastodon) - -[![Установите Mastodon с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[Прочтите этот README на других языках.](./ALL_README.md)* - -> *Этот пакет позволяет Вам установить Mastodon быстро и просто на YunoHost-сервер.* -> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* - -## Обзор - -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.3.6~ynh1 - -**Демо-версия:** - -## Снимки экрана - -![Снимок экрана Mastodon](./doc/screenshots/mastodon.png) - -## Документация и ресурсы - -- Официальный веб-сайт приложения: -- Официальная документация администратора: -- Репозиторий кода главной ветки приложения: -- Магазин YunoHost: -- Сообщите об ошибке: - -## Информация для разработчиков - -Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). - -Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -или -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md deleted file mode 100644 index ffd2e07..0000000 --- a/README_zh_Hans.md +++ /dev/null @@ -1,53 +0,0 @@ - - -# YunoHost 上的 Mastodon - -[![集成程度](https://apps.yunohost.org/badge/integration/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -![工作状态](https://apps.yunohost.org/badge/state/mastodon) -![维护状态](https://apps.yunohost.org/badge/maintained/mastodon) - -[![使用 YunoHost 安装 Mastodon](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) - -*[阅读此 README 的其它语言版本。](./ALL_README.md)* - -> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Mastodon。* -> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* - -## 概况 - -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.3.6~ynh1 - -**演示：** - -## 截图 - -![Mastodon 的截图](./doc/screenshots/mastodon.png) - -## 文档与资源 - -- 官方应用网站： -- 官方管理文档： -- 上游应用代码库： -- YunoHost 商店： -- 报告 bug： - -## 开发者信息 - -请向 [`testing` 分支](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing) 发送拉取请求。 - -如要尝试 `testing` 分支，请这样操作： - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -或 -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug -``` - -**有关应用打包的更多信息：** -- cgit v1.2.3-70-g09d2 From bf9aba95fec20e81966037cb55e5dd6582131410 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 7 May 2025 00:18:02 +0200 Subject: Upgrade sources - `main` v4.3.8: https://github.com/mastodon/mastodon/releases/tag/v4.3.8 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index fcc7218..a3b6880 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.3.7~ynh1" +version = "4.3.8~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.7.tar.gz" - sha256 = "b77590137ae74fde223cdf8ff85baa0e0337207ebe091966e161ce131147c8c2" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.8.tar.gz" + sha256 = "b3d18985a4980573940855e1ca8826fad41c9b131fcdd256d7ae7d0392037a0e" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 7830c050cd0df50e3a7027e109321714737c68e2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 7 May 2025 00:18:04 +0200 Subject: Auto-update READMEs --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c204a3..ba9d9fe 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ It shall NOT be edited by hand. -->

- Logo of Mastodon + Logo of Mastodon Mastodon, packaged for YunoHost

@@ -12,7 +12,7 @@ Libre and federated social network [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://joinmastodon.org/) [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://joinmastodon.org/) -![Version: 4.3.7~ynh1](https://img.shields.io/badge/Version-4.3.7~ynh1-rgba(0,150,0,1)?style=for-the-badge) +[![Version: 4.3.8~ynh1](https://img.shields.io/badge/Version-4.3.8~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
@@ -21,6 +21,8 @@ Libre and federated social network ## 📦 Developer info +[![Automatic tests level](https://apps.yunohost.org/badge/cilevel/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) + 🛠️ Upstream Mastodon repository: Pull request are welcome and should target the [`testing` branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). -- cgit v1.2.3-70-g09d2 From 898324f03086fca0856510e53eafc7f33189c5b3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Jul 2025 00:20:02 +0200 Subject: Upgrade sources - `main` v4.3.9: https://github.com/mastodon/mastodon/releases/tag/v4.3.9 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index a3b6880..d9f6108 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.3.8~ynh1" +version = "4.3.9~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.8.tar.gz" - sha256 = "b3d18985a4980573940855e1ca8826fad41c9b131fcdd256d7ae7d0392037a0e" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.9.tar.gz" + sha256 = "c969e80032418ddcfbed974093a5b3e4d7b7407e591d34e6ba8efceed6e7c22a" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 2b6b586da5ed5bfceb35fdde7041b6c3e6df0222 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Jul 2025 00:20:02 +0200 Subject: Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba9d9fe..3fd931c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Libre and federated social network [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://joinmastodon.org/) [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://joinmastodon.org/) -[![Version: 4.3.8~ynh1](https://img.shields.io/badge/Version-4.3.8~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +[![Version: 4.3.9~ynh1](https://img.shields.io/badge/Version-4.3.9~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
-- cgit v1.2.3-70-g09d2 From 70e2e0da5696b84ee599fd78c2ebfbfedec83d5d Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sun, 6 Jul 2025 08:33:12 +0200 Subject: Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a3b6880..93b3d3a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Réseau social libre et fédéré" version = "4.3.8~ynh1" -maintainers = ["Tagada"] +maintainers = [] [upstream] license = "AGPL-3.0-or-later" -- cgit v1.2.3-70-g09d2 From ab587fca177e27067aec80cc21c4bcf74243faf8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 6 Aug 2025 00:16:45 +0200 Subject: Upgrade sources - `main` v4.4.3: https://github.com/mastodon/mastodon/releases/tag/v4.4.3 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index d9f6108..fd14664 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.3.9~ynh1" +version = "4.4.3~ynh1" maintainers = ["Tagada"] @@ -52,8 +52,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.3.9.tar.gz" - sha256 = "c969e80032418ddcfbed974093a5b3e4d7b7407e591d34e6ba8efceed6e7c22a" + url = "https://github.com/mastodon/mastodon/archive/refs/tags/v4.4.3.tar.gz" + sha256 = "ede116b80a525462f5ea68d046a4cdd787930fc6d2f9327c140756311ee07848" autoupdate.strategy = "latest_github_release" [resources.system_user] -- cgit v1.2.3-70-g09d2 From 57e912f5c19a9354d1ddefb7a636898b569b2817 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 6 Aug 2025 00:16:46 +0200 Subject: Auto-update READMEs --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fd931c..41d14ba 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,17 @@ Libre and federated social network [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://joinmastodon.org/) [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://joinmastodon.org/) -[![Version: 4.3.9~ynh1](https://img.shields.io/badge/Version-4.3.9~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +[![Version: 4.4.3~ynh1](https://img.shields.io/badge/Version-4.4.3~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
+ +## Screenshots +![Screenshot of Mastodon](./doc/screenshots/mastodon.png) + ## 📦 Developer info [![Automatic tests level](https://apps.yunohost.org/badge/cilevel/mastodon)](https://ci-apps.yunohost.org/ci/apps/mastodon/) -- cgit v1.2.3-70-g09d2 From 1d2bff59e07dba330f3ee73b9ac08835c9a0640b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 21 Aug 2025 10:42:01 +0200 Subject: Convert to helpers v2.1 and try to upgrade to latest version --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..000df5f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +'*~' +'*.sw[op]' +'.DS_Store' -- cgit v1.2.3-70-g09d2 From e827fbe4a89c0dcd51308457e5f00a9fc5dcc18b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 21 Aug 2025 10:42:04 +0200 Subject: convert to helpers v2.1 and try to upgrade to latest version --- conf/.env.production.sample | 1 - conf/cron | 10 +-- conf/mastodon-sidekiq.service | 2 +- conf/mastodon-streaming.service | 4 +- conf/mastodon-web.service | 2 +- manifest.toml | 4 +- scripts/_common.sh | 14 +--- scripts/backup | 31 +++------ scripts/install | 119 ++++++++++++++------------------ scripts/remove | 38 +++++----- scripts/restore | 69 ++++++++----------- scripts/upgrade | 149 +++++++++++++++++----------------------- tests.toml | 3 +- 13 files changed, 183 insertions(+), 263 deletions(-) diff --git a/conf/.env.production.sample b/conf/.env.production.sample index 2abf6c5..d934fa8 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -20,7 +20,6 @@ LOCAL_DOMAIN=__DOMAIN__ # ----- REDIS_HOST=localhost REDIS_PORT=6379 -REDIS_NAMESPACE=__REDIS_NAMESPACE__ # PostgreSQL # ---------- diff --git a/conf/cron b/conf/cron index 02b2a6a..ca08f7f 100644 --- a/conf/cron +++ b/conf/cron @@ -1,7 +1,7 @@ # This is a system cron file, see crontab(5) # m h dom mon dow user command -@daily __APP__ cd __INSTALL_DIR__/live && __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl media remove -@monthly __APP__ cd __INSTALL_DIR__/live && __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl media remove-orphans -@monthly __APP__ cd __INSTALL_DIR__/live && __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl accounts cull -@monthly __APP__ cd __INSTALL_DIR__/live && __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl statuses remove -@monthly __APP__ cd __INSTALL_DIR__/live && __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl preview_cards remove +@daily __APP__ cd __INSTALL_DIR__/live && PATH=__PATH_WITH_RUBY__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl media remove +@monthly __APP__ cd __INSTALL_DIR__/live && PATH=__PATH_WITH_RUBY__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl media remove-orphans +@monthly __APP__ cd __INSTALL_DIR__/live && PATH=__PATH_WITH_RUBY__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl accounts cull +@monthly __APP__ cd __INSTALL_DIR__/live && PATH=__PATH_WITH_RUBY__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl statuses remove +@monthly __APP__ cd __INSTALL_DIR__/live && PATH=__PATH_WITH_RUBY__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl preview_cards remove diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service index ad5a6a0..0048c61 100644 --- a/conf/mastodon-sidekiq.service +++ b/conf/mastodon-sidekiq.service @@ -10,7 +10,7 @@ Environment="RAILS_ENV=production" Environment="DB_POOL=25" Environment="MALLOC_ARENA_MAX=2" Environment="__LD_PRELOAD__" -Environment="__YNH_RUBY_LOAD_PATH__" +Environment="PATH=__PATH_WITH_RUBY__" ExecStart=__INSTALL_DIR__/live/bin/bundle exec sidekiq -c 25 TimeoutSec=15 Restart=always diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service index 963a316..735fe4c 100644 --- a/conf/mastodon-streaming.service +++ b/conf/mastodon-streaming.service @@ -9,8 +9,8 @@ WorkingDirectory=__INSTALL_DIR__/live Environment="NODE_ENV=production" Environment="PORT=__PORT_STREAM__" Environment="STREAMING_CLUSTER_NUM=1" -Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__YNH_NODE__ ./streaming +Environment="PATH=__PATH_WITH_NODEJS__" +ExecStart=__NODEJS_DIR__/node ./streaming TimeoutSec=15 Restart=always StandardOutput=append:/var/log/__APP__/__APP__-streaming.log diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service index 4804b16..2635c71 100644 --- a/conf/mastodon-web.service +++ b/conf/mastodon-web.service @@ -9,7 +9,7 @@ WorkingDirectory=__INSTALL_DIR__/live Environment="RAILS_ENV=production" Environment="PORT=__PORT_WEB__" Environment="__LD_PRELOAD__" -Environment="__YNH_RUBY_LOAD_PATH__" +Environment="PATH=__PATH_WITH_RUBY__" ExecStart=__INSTALL_DIR__/live/bin/bundle exec puma -C config/puma.rb ExecReload=/bin/kill -SIGUSR1 $MAINPID TimeoutSec=15 diff --git a/manifest.toml b/manifest.toml index fd14664..2e00d20 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,8 @@ cpe = "cpe:2.3:a:joinmastodon:mastodon" fund = "https://joinmastodon.org/sponsors" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 12.0.10" +helpers_version = "2.1" architectures = "all" multi_instance = true @@ -60,6 +61,7 @@ ram.runtime = "500M" allow_email = true [resources.install_dir] + group = "www-data:r-x" [resources.permissions] main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index 0dbcc15..3421432 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,7 +1,7 @@ #!/bin/bash #================================================= -# COMMON VARIABLES +# COMMON VARIABLES AND CUSTOM HELPERS #================================================= memory_needed="2560" @@ -25,15 +25,3 @@ case $YNH_ARCH in ld_preload="LD_PRELOAD=/usr/lib/i386-linux-gnu/libjemalloc.so" ;; esac - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= diff --git a/scripts/backup b/scripts/backup index de1ba98..e9b18e8 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,31 +1,22 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # SPECIFIC BACKUP @@ -33,31 +24,31 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # BACKUP LOGROTATE #================================================= -ynh_backup --src_path="/etc/logrotate.d/$app" +ynh_backup "/etc/logrotate.d/$app" #================================================= # BACKUP SYSTEMD #================================================= -ynh_backup --src_path="/etc/systemd/system/$app-web.service" -ynh_backup --src_path="/etc/systemd/system/$app-sidekiq.service" -ynh_backup --src_path="/etc/systemd/system/$app-streaming.service" +ynh_backup "/etc/systemd/system/$app-web.service" +ynh_backup "/etc/systemd/system/$app-sidekiq.service" +ynh_backup "/etc/systemd/system/$app-streaming.service" #================================================= # BACKUP VARIOUS FILES #================================================= -ynh_backup --src_path="/etc/cron.d/$app" +ynh_backup "/etc/cron.d/$app" #================================================= # BACKUP THE POSTGRESQL DATABASE #================================================= -ynh_print_info --message="Backing up the PostgreSQL database..." +ynh_print_info "Backing up the PostgreSQL database..." -ynh_psql_dump_db --database="$db_name" > db.sql +ynh_psql_dump_db > db.sql #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index dfcbb27..6808c69 100644 --- a/scripts/install +++ b/scripts/install @@ -1,43 +1,34 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source ynh_add_swap source /usr/share/yunohost/helpers admin_mail=$(ynh_user_get_info --username=$admin --key=mail) # Set `service` settings to support `yunohost app shell` command -ynh_app_setting_set --app="$app" --key=service --value="$app-web.service" +ynh_app_setting_set --key=service --value="$app-web.service" #================================================= # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 +ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/live" -chown -R $app:www-data "$install_dir" - #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing Ruby and NodeJS..." --weight=1 +ynh_script_progression "Installing Ruby and NodeJS..." -ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_ruby_install +ynh_nodejs_install #================================================= # ADD SWAP IF NEEDED #================================================= -ynh_script_progression --message="Adding swap if needed..." --weight=1 +ynh_script_progression "Adding swap if needed..." total_memory=$(ynh_get_ram --total) swap_needed=0 @@ -47,27 +38,24 @@ if [ $total_memory -lt $memory_needed ]; then swap_needed=$(($memory_needed - $total_memory)) fi -ynh_script_progression --message="Adding $swap_needed Mo to swap..." --weight=1 +ynh_script_progression "Adding $swap_needed Mo to swap..." ynh_add_swap --size=$swap_needed #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression "Adding $app's configuration..." config="$install_dir/live/.env.production" language="$(echo $language | head -c 2)" -redis_namespace=${app}_production -ynh_app_setting_set --app="$app" --key=redis_namespace --value="$redis_namespace" - secret_key_base=$(ynh_string_random --length=128) -ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base" +ynh_app_setting_set --key=secret_key_base --value="$secret_key_base" otp_secret=$(ynh_string_random --length=128) -ynh_app_setting_set --app="$app" --key=otp_secret --value="$otp_secret" +ynh_app_setting_set --key=otp_secret --value="$otp_secret" # We need bundle exec rails to build vapid keys, we generate them later once the app is installed vapid_private_key="" @@ -78,100 +66,93 @@ active_record_encryption_deterministic_key="" active_record_encryption_key_derivation_salt="" active_record_encryption_primary_key="" -ynh_add_config --template=".env.production.sample" --destination="$config" -chmod 400 "$config" -chown $app:$app "$config" +ynh_config_add --template=".env.production.sample" --destination="$config" #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app..." --weight=1 +ynh_script_progression "Building app..." pushd "$install_dir/live" # Building ruby packages - ynh_use_ruby - ynh_gem update --system - ynh_gem install bundler --no-document - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) - ynh_use_nodejs - env $ynh_node_load_PATH corepack enable - echo Y | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --immutable + + gem update --system + gem install bundler --no-document + ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' + ynh_exec_as_app $ld_preload bin/bundle config without 'development test' + ynh_exec_as_app $ld_preload bin/bundle config set force_ruby_platform true --quiet + ynh_exec_as_app $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + + env node_load_PATH corepack enable + echo Y | ynh_hide_warnings ynh_exec_as_app yarn workspaces focus --production + ynh_hide_warnings ynh_exec_as_app yarn install --immutable echo "SAFETY_ASSURED=1">> $config # Generate vapid keys - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails mastodon:webpush:generate_vapid_key > vapid_key.txt + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails mastodon:webpush:generate_vapid_key > vapid_key.txt # Generate active record encryption - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:encryption:init > active_record_encryption.txt + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails db:encryption:init > active_record_encryption.txt popd # Re-generate config with vapid keys and active record encryption vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$install_dir/live/vapid_key.txt") -ynh_app_setting_set --app="$app" --key=vapid_private_key --value="$vapid_private_key" +ynh_app_setting_set --key=vapid_private_key --value="$vapid_private_key" vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "$install_dir/live/vapid_key.txt") -ynh_app_setting_set --app="$app" --key=vapid_public_key --value="$vapid_public_key" -ynh_secure_remove --file="$install_dir/live/vapid_key.txt" +ynh_app_setting_set --key=vapid_public_key --value="$vapid_public_key" +ynh_safe_rm "$install_dir/live/vapid_key.txt" active_record_encryption_deterministic_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") -ynh_app_setting_set --app="$app" --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" +ynh_app_setting_set --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" active_record_encryption_key_derivation_salt=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=\K.+" "$install_dir/live/active_record_encryption.txt") -ynh_app_setting_set --app="$app" --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" +ynh_app_setting_set --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" active_record_encryption_primary_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") -ynh_app_setting_set --app="$app" --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" -ynh_secure_remove --file="$install_dir/live/active_record_encryption.txt" -ynh_delete_file_checksum --file="$config" -ynh_add_config --template=".env.production.sample" --destination="$config" -chmod 400 "$config" -chown $app:$app "$config" +ynh_app_setting_set --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" +ynh_safe_rm "$install_dir/live/active_record_encryption.txt" +ynh_delete_file_checksum "$config" +ynh_config_add --template=".env.production.sample" --destination="$config" pushd "$install_dir/live" - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --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_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails db:migrate --quiet + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails assets:precompile --quiet # Create the first admin user - 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 approve "$admin" > /dev/null + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner > /dev/null + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/tootctl accounts approve "$admin" > /dev/null popd #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 +ynh_script_progression "Adding system configurations related to $app..." # Create a dedicated NGINX config using the conf/nginx.conf template -ynh_add_nginx_config +ynh_config_add_nginx # Create a dedicated systemd config -ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" +ynh_config_add_systemd --service="$app-web" --template="mastodon-web.service" yunohost service add "$app-web" --description="$app web service" -ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" +ynh_config_add_systemd --service="$app-sidekiq" --template="mastodon-sidekiq.service" yunohost service add "$app-sidekiq" --description="$app sidekiq service" -ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" +ynh_config_add_systemd --service="$app-streaming" --template="mastodon-streaming.service" yunohost service add "$app-streaming" --description="$app streaming service" # Create a cron file -ynh_add_config --template="cron" --destination="/etc/cron.d/$app" +ynh_config_add --template="cron" --destination="/etc/cron.d/$app" # Use logrotate to manage application logfile(s) mkdir -p /var/log/$app -chown $app:$app /var/log/$app -ynh_use_logrotate +ynh_config_add_logrotate -#================================================= -# GENERIC FINALIZATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting all systemd services..." --weight=1 +ynh_script_progression "Starting all systemd services..." -ynh_systemd_action --service_name=${app}-web --action="start" --log_path=/var/log/$app/$app-web.log --line_match="Listening on" -ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=/var/log/$app/$app-sidekiq.log --line_match="Schedules Loaded" -ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=/var/log/$app/$app-streaming.log --line_match="Streaming API now listening" +ynh_systemctl --service=${app}-web --action="start" --log_path=/var/log/$app/$app-web.log --wait_until="Listening on" +ynh_systemctl --service=${app}-sidekiq --action="start" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Schedules Loaded" +ynh_systemctl --service=${app}-streaming --action="start" --log_path=/var/log/$app/$app-streaming.log --wait_until="Streaming API now listening" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index c8ca3a3..85423a4 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source ynh_add_swap source /usr/share/yunohost/helpers @@ -15,44 +9,44 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +ynh_script_progression "Removing system configurations related to $app..." # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status "$app-web" >/dev/null +if ynh_hide_warnings yunohost service status "$app-web" >/dev/null then - ynh_script_progression --message="Removing $app-web service integration..." --weight=1 + ynh_script_progression "Removing $app-web service integration..." yunohost service remove "$app-web" fi -if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null +if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null then - ynh_script_progression --message="Removing $app-sidekiq service integration..." --weight=1 + ynh_script_progression "Removing $app-sidekiq service integration..." yunohost service remove "$app-sidekiq" fi -if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null +if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null then - ynh_script_progression --message="Removing $app-streaming service integration..." --weight=1 + ynh_script_progression "Removing $app-streaming service integration..." yunohost service remove "$app-streaming" fi # Remove the dedicated systemd config -ynh_remove_systemd_config --service="$app-web" -ynh_remove_systemd_config --service="$app-sidekiq" -ynh_remove_systemd_config --service="$app-streaming" +ynh_config_remove_systemd"$app-web" +ynh_config_remove_systemd"$app-sidekiq" +ynh_config_remove_systemd"$app-streaming" # Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx # Remove a cron file -ynh_secure_remove --file="/etc/cron.d/$app" +ynh_safe_rm "/etc/cron.d/$app" # Remote logrotate config -ynh_remove_logrotate +ynh_config_remove_logrotate # Remove metapackage and its dependencies -ynh_remove_ruby -ynh_remove_nodejs +ynh_ruby_remove +ynh_nodejs_remove # Remove swap ynh_del_swap @@ -61,4 +55,4 @@ ynh_del_swap # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 77e934b..9dc84ba 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source ../settings/scripts/ynh_add_swap @@ -16,26 +10,22 @@ source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=1 +ynh_script_progression "Restoring the app main directory..." -ynh_restore_file --origin_path="$install_dir" - -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +ynh_restore "$install_dir" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 +ynh_script_progression "Restoring the PostgreSQL database..." -ynh_psql_execute_as_root --sql="ALTER USER $db_user CREATEDB;" -ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" +ynh_psql_db_shell <<< "ALTER USER $db_user CREATEDB;" +ynh_psql_db_shell " < "./db.sql"" #================================================= # ADD SWAP IF NEEDED #================================================= -ynh_script_progression --message="Adding swap if needed..." --weight=1 +ynh_script_progression "Adding swap if needed..." total_memory=$(ynh_get_ram --total) swap_needed=0 @@ -45,28 +35,28 @@ if [ $total_memory -lt $memory_needed ]; then swap_needed=$(($memory_needed - $total_memory)) fi -ynh_script_progression --message="Adding $swap_needed Mo to swap..." --weight=1 +ynh_script_progression "Adding $swap_needed Mo to swap..." ynh_add_swap --size=$swap_needed #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling Ruby and NodeJS..." --weight=1 +ynh_script_progression "Reinstalling Ruby and NodeJS..." -ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_ruby_install +ynh_nodejs_install #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app..." --weight=1 +ynh_script_progression "Building app..." pushd "$install_dir/live" - ynh_use_ruby - ynh_gem update --system - ynh_gem install bundler --no-document - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install --redownload -j$(getconf _NPROCESSORS_ONLN) + + gem update --system + gem install bundler --no-document + ynh_exec_as_app $ld_preload bin/bundle install --redownload -j$(getconf _NPROCESSORS_ONLN) popd #================================================= @@ -74,40 +64,37 @@ popd #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +ynh_script_progression "Restoring system configurations related to $app..." -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/systemd/system/$app-web.service" -ynh_restore_file --origin_path="/etc/systemd/system/$app-sidekiq.service" -ynh_restore_file --origin_path="/etc/systemd/system/$app-streaming.service" +ynh_restore "/etc/systemd/system/$app-web.service" +ynh_restore "/etc/systemd/system/$app-sidekiq.service" +ynh_restore "/etc/systemd/system/$app-streaming.service" systemctl enable "$app-web" "$app-sidekiq" "$app-streaming" --quiet yunohost service add "$app-web" --description="$app web service" yunohost service add "$app-sidekiq" --description="$app sidekiq service" yunohost service add "$app-streaming" --description="$app streaming service" -ynh_restore_file --origin_path="/etc/cron.d/$app" +ynh_restore "/etc/cron.d/$app" mkdir -p /var/log/$app -chown -R $app:$app /var/log/$app -ynh_restore_file --origin_path="/etc/logrotate.d/$app" +ynh_restore "/etc/logrotate.d/$app" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX AND THE APP SERVICE #================================================= -ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 +ynh_script_progression "Reloading NGINX web server and $app's service..." -ynh_systemd_action --service_name=${app}-web --action="start" --log_path=/var/log/$app/$app-web.log --line_match="Listening on" -ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=/var/log/$app/$app-sidekiq.log --line_match="Schedules Loaded" -ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=/var/log/$app/$app-streaming.log --line_match="Streaming API now listening" +ynh_systemctl --service=${app}-web --action="start" --log_path=/var/log/$app/$app-web.log --wait_until="Listening on" +ynh_systemctl --service=${app}-sidekiq --action="start" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Schedules Loaded" +ynh_systemctl --service=${app}-streaming --action="start" --log_path=/var/log/$app/$app-streaming.log --wait_until="Streaming API now listening" -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index f7a3573..ed19b64 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,77 +1,62 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source ynh_add_swap source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) config="$install_dir/live/.env.production" #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -if ynh_compare_current_package_version --comparison lt --version "4.2.8~ynh2"; then +if ynh_app_upgrading_from_version_before 4.2.8~ynh2; then # Workaround for pre-packagingv2 versions - ynh_systemd_action --service_name=${app}-web --action="stop" --log_path="systemd" --line_match="Goodbye" - ynh_systemd_action --service_name=${app}-sidekiq --action="stop" --log_path="systemd" --line_match="Bye" - ynh_systemd_action --service_name=${app}-streaming --action="stop" --log_path="systemd" + ynh_systemctl --service=${app}-web --action="stop" --log_path="systemd" --wait_until="Goodbye" + ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path="systemd" --wait_until="Bye" + ynh_systemctl --service=${app}-streaming --action="stop" --log_path="systemd" else - ynh_systemd_action --service_name=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --line_match="Goodbye" - ynh_systemd_action --service_name=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --line_match="Bye" - ynh_systemd_action --service_name=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log + ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" + ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" + ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log fi #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 +ynh_script_progression "Ensuring downward compatibility..." # Set `service` settings to support `yunohost app shell` command -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 +ynh_app_setting_set_default --key=service --value="$app-web.service" # Remove previous added repository ynh_remove_extra_repo -if ynh_compare_current_package_version --comparison lt --version "4.2.8~ynh2"; then +if ynh_app_upgrading_from_version_before 4.2.8~ynh2; then # Rename legacy database if ynh_psql_database_exists --database="${app}_production"; then db_name=$(ynh_sanitize_dbid --db_name="$app") - ynh_app_setting_set --app="$app" --key="db_name" --value="$db_name" + ynh_app_setting_set --key="db_name" --value="$db_name" # Remove the newly created db by resources, and rename legacy db - ynh_psql_execute_as_root --sql="DROP DATABASE IF EXISTS $db_name;" - ynh_psql_execute_as_root --sql="ALTER DATABASE ${app}_production RENAME TO $db_name;" + ynh_psql_db_shell <<< "DROP DATABASE IF EXISTS $db_name;" + ynh_psql_db_shell <<< "ALTER DATABASE ${app}_production RENAME TO $db_name;" fi # Same with user if ynh_psql_user_exists --user="${app}_production"; then db_user="$db_name" - ynh_app_setting_set --app="$app" --key="db_user" --value="$db_user" + ynh_app_setting_set --key="db_user" --value="$db_user" - ynh_psql_execute_as_root --sql="DROP USER IF EXISTS $db_user;" - ynh_psql_execute_as_root --sql="ALTER USER ${app}_production RENAME $db_user;" + ynh_psql_db_shell <<< "DROP USER IF EXISTS $db_user;" + ynh_psql_db_shell <<< "ALTER USER ${app}_production RENAME $db_user;" fi fi #================================================= # ADD SWAP IF NEEDED #================================================= -ynh_script_progression --message="Adding swap if needed..." --weight=1 +ynh_script_progression "Adding swap if needed..." total_memory=$(ynh_get_ram --total) swap_needed=0 @@ -81,16 +66,16 @@ if [ $total_memory -lt $memory_needed ]; then swap_needed=$(($memory_needed - $total_memory)) fi -ynh_script_progression --message="Adding $swap_needed Mo to swap..." +ynh_script_progression "Adding $swap_needed Mo to swap..." ynh_add_swap --size=$swap_needed #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading Ruby and NodeJS..." --weight=1 +ynh_script_progression "Upgrading Ruby and NodeJS..." -ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_ruby_install +ynh_nodejs_install #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) @@ -98,115 +83,107 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] +# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed +if ynh_app_upstream_version_changed then - ynh_script_progression --message="Upgrading source files..." --weight=1 + ynh_script_progression "Upgrading source files..." # Download, check integrity, uncompress and patch the source from manifest.toml - ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system .env.production" - - chmod 750 "$install_dir" - chmod -R o-rwx "$install_dir" - chown -R $app:www-data "$install_dir" + ynh_setup_source --dest_dir="$install_dir/live" --full_replace --keep="public/system .env.production" fi #================================================= # BUILD ASSETS #================================================= -ynh_script_progression --message="Building assets..." --weight=1 +ynh_script_progression "Building assets..." pushd "$install_dir/live" - ynh_use_ruby - ynh_gem update --system - ynh_gem install bundler --no-document - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) - ynh_use_nodejs - env $ynh_node_load_PATH corepack enable - echo Y | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --immutable + + gem update --system + gem install bundler --no-document + ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' + ynh_exec_as_app $ld_preload bin/bundle config without 'development test' + ynh_exec_as_app $ld_preload bin/bundle config set force_ruby_platform true --quiet + ynh_exec_as_app $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + + env node_load_PATH corepack enable + echo Y | ynh_hide_warnings ynh_exec_as_app yarn workspaces focus --production + ynh_hide_warnings ynh_exec_as_app yarn install --immutable popd -chown "$app:www-data" "$install_dir" chown -R "$app:www-data" "$install_dir/live/public" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 +ynh_script_progression "Upgrading system configurations related to $app..." -ynh_add_nginx_config +ynh_config_add_nginx # Create a dedicated systemd config -ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" +ynh_config_add_systemd --service="$app-web" --template="mastodon-web.service" yunohost service add "$app-web" --description="$app web service" -ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" +ynh_config_add_systemd --service="$app-sidekiq" --template="mastodon-sidekiq.service" yunohost service add "$app-sidekiq" --description="$app sidekiq service" -ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" +ynh_config_add_systemd --service="$app-streaming" --template="mastodon-streaming.service" yunohost service add "$app-streaming" --description="$app streaming service" -ynh_add_config --template="cron" --destination="/etc/cron.d/$app" +ynh_config_add --template="cron" --destination="/etc/cron.d/$app" # Use logrotate to manage app-specific logfile(s) mkdir -p /var/log/$app -chown $app:$app /var/log/$app -ynh_use_logrotate --non-append +ynh_config_add_logrotate #================================================= # RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a config file..." --weight=1 +ynh_script_progression "Updating a config file..." -if ynh_compare_current_package_version --comparison lt --version "4.3.2~ynh1"; then +if ynh_app_upgrading_from_version_before 4.3.2~ynh1; then pushd "$install_dir/live" - ynh_use_ruby + # Generate active record encryption - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:encryption:init > active_record_encryption.txt + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails db:encryption:init > active_record_encryption.txt active_record_encryption_deterministic_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") - ynh_app_setting_set --app="$app" --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" + ynh_app_setting_set --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" active_record_encryption_key_derivation_salt=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=\K.+" "$install_dir/live/active_record_encryption.txt") - ynh_app_setting_set --app="$app" --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" + ynh_app_setting_set --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" active_record_encryption_primary_key=$(grep -oP "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=\K.+" "$install_dir/live/active_record_encryption.txt") - ynh_app_setting_set --app="$app" --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" - ynh_secure_remove --file="$install_dir/live/active_record_encryption.txt" + ynh_app_setting_set --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" + ynh_safe_rm "$install_dir/live/active_record_encryption.txt" popd fi language="$(echo $language | head -c 2)" -ynh_add_config --template=".env.production.sample" --destination="$config" - -chmod 400 "$config" -chown $app:$app "$config" +ynh_config_add --template=".env.production.sample" --destination="$config" #================================================= # APPLY MIGRATIONS #================================================= -ynh_script_progression --message="Applying migrations..." --weight=1 +ynh_script_progression "Applying migrations..." pushd "$install_dir/live" - ynh_use_ruby - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --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_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails db:migrate --quiet + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails assets:precompile --quiet popd #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=${app}-web --action="restart" --log_path=/var/log/$app/$app-web.log --line_match="Listening on" -ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=/var/log/$app/$app-sidekiq.log --line_match="Schedules Loaded" -ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=/var/log/$app/$app-streaming.log --line_match="Streaming API now listening" +ynh_systemctl --service=${app}-web --action="restart" --log_path=/var/log/$app/$app-web.log --wait_until="Listening on" +ynh_systemctl --service=${app}-sidekiq --action="start" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Schedules Loaded" +ynh_systemctl --service=${app}-streaming --action="start" --log_path=/var/log/$app/$app-streaming.log --wait_until="Streaming API now listening" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed" diff --git a/tests.toml b/tests.toml index c983544..a084d02 100644 --- a/tests.toml +++ b/tests.toml @@ -27,4 +27,5 @@ test_format = 1.0 test_upgrade_from.43504e6.args.admin="john" test_upgrade_from.43504e6.args.language="fr_FR" - test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "Upgrade from 4.2.13~ynh1" + test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1" + test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1" -- cgit v1.2.3-70-g09d2 From b8c794784bc1e07404cb9854499e4daa415e42d0 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:50:05 +0200 Subject: fix permissions --- manifest.toml | 1 - scripts/install | 4 ++++ scripts/upgrade | 14 +++++++------- scripts/ynh_add_swap | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2e00d20..4e2591d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,6 @@ ram.runtime = "500M" allow_email = true [resources.install_dir] - group = "www-data:r-x" [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index 6808c69..6608646 100644 --- a/scripts/install +++ b/scripts/install @@ -17,6 +17,10 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir/live" +chmod -R 775 "$install_dir" +chmod o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" + #================================================= # INSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ed19b64..d9fa23f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,14 +83,14 @@ ynh_nodejs_install # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed -if ynh_app_upstream_version_changed -then - ynh_script_progression "Upgrading source files..." +ynh_script_progression "Upgrading source files..." - # Download, check integrity, uncompress and patch the source from manifest.toml - ynh_setup_source --dest_dir="$install_dir/live" --full_replace --keep="public/system .env.production" -fi +# Download, check integrity, uncompress and patch the source from manifest.toml +ynh_setup_source --dest_dir="$install_dir/live" --full_replace --keep="public/system .env.production" + +chmod -R 775 "$install_dir" +chmod o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # BUILD ASSETS diff --git a/scripts/ynh_add_swap b/scripts/ynh_add_swap index aa82c51..f99e1a7 100644 --- a/scripts/ynh_add_swap +++ b/scripts/ynh_add_swap @@ -22,14 +22,14 @@ ynh_add_swap () { # Can't swap inside an LXD if [ "$(systemd-detect-virt)" == "lxc" ] then - ynh_print_warn --message="You are inside a LXC container, swap will not be added, but that can cause troubles for the app $app. Please make sure you have more than 2.5G available RAM." + ynh_print_warn "You are inside a LXC container, swap will not be added, but that can cause troubles for the app $app. Please make sure you have more than 2.5G available RAM." return fi # Swap on SD card only if it's is specified if ynh_is_main_device_a_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ] then - ynh_print_warn --message="The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'" + ynh_print_warn "The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'" return fi -- cgit v1.2.3-70-g09d2 From 2184a24d68831b7789357549db30d00423c5e510 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 21 Aug 2025 14:08:33 +0200 Subject: remove node_load_PATH --- scripts/install | 10 +++++----- scripts/upgrade | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 6608646..a8ede41 100644 --- a/scripts/install +++ b/scripts/install @@ -82,12 +82,12 @@ pushd "$install_dir/live" gem update --system gem install bundler --no-document - ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' - ynh_exec_as_app $ld_preload bin/bundle config without 'development test' - ynh_exec_as_app $ld_preload bin/bundle config set force_ruby_platform true --quiet - ynh_exec_as_app $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config without 'development test' + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config set force_ruby_platform true --quiet + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) - env node_load_PATH corepack enable + env corepack enable echo Y | ynh_hide_warnings ynh_exec_as_app yarn workspaces focus --production ynh_hide_warnings ynh_exec_as_app yarn install --immutable echo "SAFETY_ASSURED=1">> $config diff --git a/scripts/upgrade b/scripts/upgrade index d9fa23f..d44d200 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,12 +101,12 @@ pushd "$install_dir/live" gem update --system gem install bundler --no-document - ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' - ynh_exec_as_app $ld_preload bin/bundle config without 'development test' - ynh_exec_as_app $ld_preload bin/bundle config set force_ruby_platform true --quiet - ynh_exec_as_app $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config without 'development test' + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config set force_ruby_platform true --quiet + ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) - env node_load_PATH corepack enable + env corepack enable echo Y | ynh_hide_warnings ynh_exec_as_app yarn workspaces focus --production ynh_hide_warnings ynh_exec_as_app yarn install --immutable popd -- cgit v1.2.3-70-g09d2 From 9a9079042ee2923c1a5dfa59dcbe17ee3e03617d Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 21 Aug 2025 18:41:51 +0200 Subject: fixes --- scripts/install | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index a8ede41..b9d9219 100644 --- a/scripts/install +++ b/scripts/install @@ -9,7 +9,13 @@ admin_mail=$(ynh_user_get_info --username=$admin --key=mail) ynh_app_setting_set --key=service --value="$app-web.service" #================================================= -# APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) +# INSTALL DEPENDENCIES +#================================================= +ynh_script_progression "Installing Ruby and NodeJS..." + +ynh_ruby_install +ynh_nodejs_install + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -21,14 +27,6 @@ chmod -R 775 "$install_dir" chmod o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression "Installing Ruby and NodeJS..." - -ynh_ruby_install -ynh_nodejs_install - #================================================= # ADD SWAP IF NEEDED #================================================= @@ -79,7 +77,6 @@ ynh_script_progression "Building app..." pushd "$install_dir/live" # Building ruby packages - gem update --system gem install bundler --no-document ynh_hide_warnings ynh_exec_as_app $ld_preload bin/bundle config deployment 'true' @@ -159,4 +156,4 @@ ynh_systemctl --service=${app}-streaming --action="start" --log_path=/var/log/$a # END OF SCRIPT #================================================= -ynh_script_progression "Installation of $app completed" +ynh_script_progression "Installation of $app completed" \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 0e8f26cae17062e81422d8acfc601ac43f175f63 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Aug 2025 22:44:57 +0200 Subject: Apply AlisonSelby's patch See https://github.com/YunoHost-Apps/glitchsoc_ynh/pull/374/commits/3a6deeb1fbb52c4ae6fa74c62b87a88fb718a635 --- conf/.env.production.sample | 1 - manifest.toml | 7 +++++++ scripts/install | 5 ++--- scripts/upgrade | 13 +++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/conf/.env.production.sample b/conf/.env.production.sample index 2abf6c5..d934fa8 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -20,7 +20,6 @@ LOCAL_DOMAIN=__DOMAIN__ # ----- REDIS_HOST=localhost REDIS_PORT=6379 -REDIS_NAMESPACE=__REDIS_NAMESPACE__ # PostgreSQL # ---------- diff --git a/manifest.toml b/manifest.toml index fd14664..4f88e38 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,6 +56,13 @@ ram.runtime = "500M" sha256 = "ede116b80a525462f5ea68d046a4cdd787930fc6d2f9327c140756311ee07848" autoupdate.strategy = "latest_github_release" + [resources.sources.redis_migration] + url = "https://raw.githubusercontent.com/mastodon/redis_namespace_migration/47c6bd9757e7a40f7091b5692d78aef992ea8bf2/rename.rb" + sha256 = "3134a5c7e0157ee752f5cb49b942c89480951e94236b03dd1cb3cb1d3afdcdd2" + in_subdir = false + extract = false + rename = "rename.rb" + [resources.system_user] allow_email = true diff --git a/scripts/install b/scripts/install index dfcbb27..21361f2 100644 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/live" +# Download redis migration script +ynh_setup_source --source_id=redis_migration --dest_dir="$install_dir/live" chown -R $app:www-data "$install_dir" @@ -60,9 +62,6 @@ config="$install_dir/live/.env.production" language="$(echo $language | head -c 2)" -redis_namespace=${app}_production -ynh_app_setting_set --app="$app" --key=redis_namespace --value="$redis_namespace" - secret_key_base=$(ynh_string_random --length=128) ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base" diff --git a/scripts/upgrade b/scripts/upgrade index f7a3573..ab1d807 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -104,6 +104,8 @@ then # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system .env.production" + # Download redis migration script + ynh_setup_source --source_id=redis_migration --dest_dir="$install_dir/live" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -194,6 +196,17 @@ pushd "$install_dir/live" ynh_use_ruby ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --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 + + # Apply redis namespace migration (https://github.com/mastodon/redis_namespace_migration) + ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" $ld_preload bin/rails runner rename.rb + redis_namespace="$(ynh_app_setting_get --app=$app --key=redis_namespace)" + if [ $redis_namespace ]; then + if [ ynh_app_setting_get --app=$app --key=es_enabled == "true" ] && [ ynh_app_setting_get --app=$app --key=es_prefix == "" ]; then + ynh_app_setting_set --app=$app --key=es_prefix --value=$redis_namespace + else + ynh_app_setting_delete --app=$app --key=redis_namespace + fi + fi popd #================================================= -- cgit v1.2.3-70-g09d2 From ece66a86b23651ed2ef3a6532cd7f6ae2e740d2c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Aug 2025 22:50:36 +0200 Subject: Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41d14ba..e285399 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Libre and federated social network [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://joinmastodon.org/) [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://joinmastodon.org/) -[![Version: 4.4.3~ynh1](https://img.shields.io/badge/Version-4.4.3~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/) +[![Version: 4.4.3~ynh1](https://img.shields.io/badge/Version-4.4.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/mastodon/)
-- cgit v1.2.3-70-g09d2 From 730497da8b99770c9f5f96b5c3e98bfc035f0d08 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Aug 2025 23:04:37 +0200 Subject: Update ruby version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0dbcc15..e894197 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= memory_needed="2560" -ruby_version=3.3.5 +ruby_version=3.4.5 nodejs_version=20 case $YNH_ARCH in -- cgit v1.2.3-70-g09d2 From efb0166d5be53944abb484c0077aaa1e301d3cea Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 24 Aug 2025 13:48:33 +0200 Subject: Reimplement warnings for debugging --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 21361f2..49297e6 100644 --- a/scripts/install +++ b/scripts/install @@ -125,11 +125,11 @@ chmod 400 "$config" chown $app:$app "$config" pushd "$install_dir/live" - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --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_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet + ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet # Create the first admin user - 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 approve "$admin" > /dev/null + ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner + ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts approve "$admin" popd #================================================= -- cgit v1.2.3-70-g09d2 From a6059396f8ee42645b9588809f81950539f01980 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 24 Aug 2025 14:14:25 +0200 Subject: Seed database to create Owner role --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 49297e6..d7851d9 100644 --- a/scripts/install +++ b/scripts/install @@ -126,6 +126,7 @@ chown $app:$app "$config" pushd "$install_dir/live" ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet + ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:seed --quiet ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet # Create the first admin user ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner -- cgit v1.2.3-70-g09d2 From d5c70e78295e0a35026bf2e1848ef40ac0092fda Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 24 Aug 2025 14:40:38 +0200 Subject: Hide warnings again --- scripts/install | 12 ++++++------ scripts/upgrade | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index d7851d9..2d3e68d 100644 --- a/scripts/install +++ b/scripts/install @@ -94,7 +94,7 @@ pushd "$install_dir/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs env $ynh_node_load_PATH corepack enable echo Y | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production @@ -125,12 +125,12 @@ chmod 400 "$config" chown $app:$app "$config" pushd "$install_dir/live" - ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet - ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:seed --quiet - 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 rails db:migrate --quiet + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:seed --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 # Create the first admin user - ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner - ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts approve "$admin" + ynh_exec_quiet ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts approve "$admin" popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ab1d807..746d009 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,7 +124,7 @@ pushd "$install_dir/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs env $ynh_node_load_PATH corepack enable echo Y | ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn workspaces focus --production -- cgit v1.2.3-70-g09d2 From 6f3d2987174de20f1ca0847745013f85363ae324 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Sun, 24 Aug 2025 15:35:30 +0200 Subject: Hide warning during restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 77e934b..48e1384 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,7 @@ pushd "$install_dir/live" ynh_use_ruby ynh_gem update --system ynh_gem install bundler --no-document - ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install --redownload -j$(getconf _NPROCESSORS_ONLN) + ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install --redownload -j$(getconf _NPROCESSORS_ONLN) popd #================================================= -- cgit v1.2.3-70-g09d2 From 28f4fc68fcfd4991d7e427c479a3583544cec60a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Aug 2025 07:55:20 +0200 Subject: fix remove services --- scripts/remove | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/remove b/scripts/remove index 85423a4..297786f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -31,9 +31,9 @@ then fi # Remove the dedicated systemd config -ynh_config_remove_systemd"$app-web" -ynh_config_remove_systemd"$app-sidekiq" -ynh_config_remove_systemd"$app-streaming" +ynh_config_remove_systemd "$app-web" +ynh_config_remove_systemd "$app-sidekiq" +ynh_config_remove_systemd "$app-streaming" # Remove the dedicated NGINX config ynh_config_remove_nginx -- cgit v1.2.3-70-g09d2 From 1f8bf44173709effa51a1b5a71198283dc753f37 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Aug 2025 08:42:42 +0200 Subject: fix restore postgresql --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 51139ed..0becd6c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,7 +20,7 @@ ynh_restore "$install_dir" ynh_script_progression "Restoring the PostgreSQL database..." ynh_psql_db_shell <<< "ALTER USER $db_user CREATEDB;" -ynh_psql_db_shell " < "./db.sql"" +ynh_psql_db_shell < "./db.sql" #================================================= # ADD SWAP IF NEEDED -- cgit v1.2.3-70-g09d2 From 1699bcd2aa815ac0351afaa60a4c988b91b7fca1 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Aug 2025 08:53:12 +0200 Subject: ynh_remove_extra_repo doesn't exist anymore --- scripts/upgrade | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index aef5d67..301edcd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,9 +30,6 @@ ynh_script_progression "Ensuring downward compatibility..." # Set `service` settings to support `yunohost app shell` command ynh_app_setting_set_default --key=service --value="$app-web.service" -# Remove previous added repository -ynh_remove_extra_repo - if ynh_app_upgrading_from_version_before 4.2.8~ynh2; then # Rename legacy database if ynh_psql_database_exists --database="${app}_production"; then -- cgit v1.2.3-70-g09d2 From aa257c2544dbd5e29650abf3fda3a67e4ae3561a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 25 Aug 2025 10:04:31 +0200 Subject: fix typo --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 301edcd..648c316 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,13 +170,13 @@ pushd "$install_dir/live" ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production $ld_preload bin/bundle exec rails assets:precompile --quiet # Apply redis namespace migration (https://github.com/mastodon/redis_namespace_migration) - ynh_hide_warings ynh_exec_as_app RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 $ld_preload bin/rails runner rename.rb + ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 $ld_preload bin/rails runner rename.rb redis_namespace="$(ynh_app_setting_get --app=$app --key=redis_namespace)" if [ $redis_namespace ]; then - if [ ynh_app_setting_get --app=$app --key=es_enabled == "true" ] && [ ynh_app_setting_get --app=$app --key=es_prefix == "" ]; then - ynh_app_setting_set --app=$app --key=es_prefix --value=$redis_namespace + if [ ynh_app_setting_get --key=es_enabled == "true" ] && [ ynh_app_setting_get --key=es_prefix == "" ]; then + ynh_app_setting_set --key=es_prefix --value=$redis_namespace else - ynh_app_setting_delete --app=$app --key=redis_namespace + ynh_app_setting_delete --key=redis_namespace fi fi popd -- cgit v1.2.3-70-g09d2 From 5593f9befe248490113e2b0030aa293ca604dfec Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 26 Aug 2025 08:51:51 +0200 Subject: remove upgrade from 4.2.8 -> ynh_die in the place --- scripts/upgrade | 38 +++++++++----------------------------- tests.toml | 8 +------- 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 648c316..769b47c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -6,21 +6,21 @@ source /usr/share/yunohost/helpers config="$install_dir/live/.env.production" +if ynh_app_upgrading_from_version_before 4.2.8~ynh2; then + ynh_die "Your installation is to old to update to this version. \ + \nPlease first manually update with 4.4.3~ynh1 with the following command: \ + \n's\0u\0d\0o yunohost app upgrade $app -u https://github.com/YunoHost-Apps/mastodon_ynh/commit/8fb1c6c7818430e8ac49f3ae589c6575614f5e4b' \ + \nOnce done you can upgrade to the latest version." +fi + #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression "Stopping $app's systemd service..." -if ynh_app_upgrading_from_version_before 4.2.8~ynh2; then - # Workaround for pre-packagingv2 versions - ynh_systemctl --service=${app}-web --action="stop" --log_path="systemd" --wait_until="Goodbye" - ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path="systemd" --wait_until="Bye" - ynh_systemctl --service=${app}-streaming --action="stop" --log_path="systemd" -else +ynh_script_progression "Stopping $app's systemd service..." ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log -fi #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -30,26 +30,6 @@ ynh_script_progression "Ensuring downward compatibility..." # Set `service` settings to support `yunohost app shell` command ynh_app_setting_set_default --key=service --value="$app-web.service" -if ynh_app_upgrading_from_version_before 4.2.8~ynh2; then - # Rename legacy database - if ynh_psql_database_exists --database="${app}_production"; then - db_name=$(ynh_sanitize_dbid --db_name="$app") - ynh_app_setting_set --key="db_name" --value="$db_name" - - # Remove the newly created db by resources, and rename legacy db - ynh_psql_db_shell <<< "DROP DATABASE IF EXISTS $db_name;" - ynh_psql_db_shell <<< "ALTER DATABASE ${app}_production RENAME TO $db_name;" - fi - # Same with user - if ynh_psql_user_exists --user="${app}_production"; then - db_user="$db_name" - ynh_app_setting_set --key="db_user" --value="$db_user" - - ynh_psql_db_shell <<< "DROP USER IF EXISTS $db_user;" - ynh_psql_db_shell <<< "ALTER USER ${app}_production RENAME $db_user;" - fi -fi - #================================================= # ADD SWAP IF NEEDED #================================================= @@ -171,7 +151,7 @@ pushd "$install_dir/live" # Apply redis namespace migration (https://github.com/mastodon/redis_namespace_migration) ynh_hide_warnings ynh_exec_as_app RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 $ld_preload bin/rails runner rename.rb - redis_namespace="$(ynh_app_setting_get --app=$app --key=redis_namespace)" + redis_namespace="$(ynh_app_setting_get --key=redis_namespace)" if [ $redis_namespace ]; then if [ ynh_app_setting_get --key=es_enabled == "true" ] && [ ynh_app_setting_get --key=es_prefix == "" ]; then ynh_app_setting_set --key=es_prefix --value=$redis_namespace diff --git a/tests.toml b/tests.toml index a084d02..b34a3e6 100644 --- a/tests.toml +++ b/tests.toml @@ -20,12 +20,6 @@ test_format = 1.0 # ------------------------------- # Commits to test upgrade from # ------------------------------- - - test_upgrade_from.43504e6.name = "Upgrade from 4.2.5~ynh1" - test_upgrade_from.43504e6.args.domain="domain.tld" - test_upgrade_from.43504e6.args.is_public=1 - test_upgrade_from.43504e6.args.admin="john" - test_upgrade_from.43504e6.args.language="fr_FR" - + test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1" test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1" -- cgit v1.2.3-70-g09d2 From 0bb237a755828f8fc2fa13fbb14f7dfe4c523f1c Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 26 Aug 2025 17:07:52 +0200 Subject: Bump minimal Yunohost compatibility to v12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because the lipvips dependency can’t be met on Debian 11 “ Incompatible libvips version (8.10.5-Wed Apr 30 17:29:54 UTC 2025), please install libvips >= 8.13” https://packages.debian.org/search?keywords=libvips-dev --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5141882..3355cd7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ cpe = "cpe:2.3:a:joinmastodon:mastodon" fund = "https://joinmastodon.org/sponsors" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 12.0" architectures = "all" multi_instance = true -- cgit v1.2.3-70-g09d2 From 9d34db18df100918645c7f839d2d62bf44fc4d2d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:12:59 +0200 Subject: cleaning --- manifest.toml | 1 - scripts/_common.sh | 4 ++-- scripts/remove | 14 +++----------- scripts/restore | 4 ---- scripts/upgrade | 13 ++++--------- tests.toml | 2 +- 6 files changed, 10 insertions(+), 28 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7f0b634..3575af5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,7 +25,6 @@ architectures = "all" multi_instance = true ldap = true - sso = false disk = "2G" diff --git a/scripts/_common.sh b/scripts/_common.sh index 182e391..acc9c4b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,8 +5,8 @@ #================================================= memory_needed="2560" -ruby_version=3.4.5 -nodejs_version=20 +ruby_version="3.4.5" +nodejs_version="20" case $YNH_ARCH in amd64) diff --git a/scripts/remove b/scripts/remove index 297786f..d2c0cb5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,26 +7,18 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SYSTEMD SERVICE -#================================================= ynh_script_progression "Removing system configurations related to $app..." # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_hide_warnings yunohost service status "$app-web" >/dev/null -then - ynh_script_progression "Removing $app-web service integration..." +if ynh_hide_warnings yunohost service status "$app-web" >/dev/null; then yunohost service remove "$app-web" fi -if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null -then - ynh_script_progression "Removing $app-sidekiq service integration..." +if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null; then yunohost service remove "$app-sidekiq" fi -if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null -then - ynh_script_progression "Removing $app-streaming service integration..." +if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null; then yunohost service remove "$app-streaming" fi diff --git a/scripts/restore b/scripts/restore index 0becd6c..03f0dce 100644 --- a/scripts/restore +++ b/scripts/restore @@ -5,8 +5,6 @@ source ../settings/scripts/_common.sh source ../settings/scripts/ynh_add_swap source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -61,8 +59,6 @@ popd #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= ynh_script_progression "Restoring system configurations related to $app..." ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 769b47c..3b8f6e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,11 +16,11 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= - ynh_script_progression "Stopping $app's systemd service..." - ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" - ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" - ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log + +ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" +ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" +ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -54,12 +54,9 @@ ynh_script_progression "Upgrading Ruby and NodeJS..." ynh_ruby_install ynh_nodejs_install -#================================================= -# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= - ynh_script_progression "Upgrading source files..." # Download, check integrity, uncompress and patch the source from manifest.toml @@ -114,8 +111,6 @@ ynh_config_add --template="cron" --destination="/etc/cron.d/$app" mkdir -p /var/log/$app ynh_config_add_logrotate -#================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) #================================================= # UPDATE A CONFIG FILE #================================================= diff --git a/tests.toml b/tests.toml index b34a3e6..588a0db 100644 --- a/tests.toml +++ b/tests.toml @@ -21,5 +21,5 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1" + #test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1" test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1" -- cgit v1.2.3-70-g09d2 From edbf9871a19fd30634d86e7ff41d4f33b92521d4 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:13:55 +0200 Subject: Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index acc9c4b..089f541 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ memory_needed="2560" ruby_version="3.4.5" -nodejs_version="20" +nodejs_version="22" case $YNH_ARCH in amd64) -- cgit v1.2.3-70-g09d2