Merge pull request #271 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee 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)

README.md

@@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web
 
 
-**Shipped version:** 2.6.2~ynh1
+**Shipped version:** 2.6.2~ynh2
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,52 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Pleroma para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg)
+
+[![Instalar Pleroma con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pleroma)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarPleroma 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
+
+Pleroma is a microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub. What that means is that you can host a server for yourself or your friends and stay in control of your online identity, but still exchange messages with people on larger servers. Pleroma will federate with all servers that implement ActivityPub, like Friendica, GNU Social, Hubzilla, Mastodon, Misskey, Peertube, and Pixelfed.
+
+For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post/what-is-pleroma/)
+
+**Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web
+
+
+**Versión actual:** 2.6.2~ynh2
+
+## Capturas
+
+![Captura de Pleroma](./doc/screenshots/screenshot1.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://pleroma.social/>
+- Documentación administrador oficial: <https://docs.pleroma.social/>
+- Repositorio del código fuente oficial de la aplicación : <https://git.pleroma.social/pleroma/pleroma/>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/pleroma>
+- Reportar un error: <https://github.com/YunoHost-Apps/pleroma_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/pleroma_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/pleroma_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade pleroma -u https://github.com/YunoHost-Apps/pleroma_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web
 
 
-**Paketatutako bertsioa:** 2.6.2~ynh1
+**Paketatutako bertsioa:** 2.6.2~ynh2
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -23,7 +23,7 @@ Pour des informations plus détaillées sur Pleroma voir [What is Pleroma](https
 **Interface utilisateur Mastodon pour Pleroma :** Ajouter `/web` à la fin du nom de domaine (URL) de votre installation, par exemple : `https://pleroma.domain.tld/web`
 
 
-**Version incluse :** 2.6.2~ynh1
+**Version incluse :** 2.6.2~ynh2
 
 ## Captures d’écran
 

README_gl.md

@@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web
 
 
-**Versión proporcionada:** 2.6.2~ynh1
+**Versión proporcionada:** 2.6.2~ynh2
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Pleroma
+# YunoHost 上的 Pleroma
 
 [![集成程度](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![工作状态](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg)
 
@@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post
 **Mastodon web front-end for Pleroma:** Add **/web** in front of your Pleroma domain, eg. pleroma.domain.tld/web
 
 
-**分发版本：** 2.6.2~ynh1
+**分发版本：** 2.6.2~ynh2
 
 ## 截图
 

manifest.toml

@@ -7,9 +7,9 @@ name = "Pleroma"
 description.en = "Federated social networking server built on open protocols"
 description.fr = "Serveur de réseautage social fédéré basé sur des protocoles ouverts"
 
-version = "2.6.2~ynh1"
+version = "2.6.2~ynh2"
 
-maintainers = ["Anmol Sharma", "yalh76"]
+maintainers = []
 
 [upstream]
 license = "AGPL-3.0-only"
@@ -26,8 +26,8 @@ multi_instance = false
 ldap = true
 sso = false
 disk = "200M"
-ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+ram.build = "50M"
+ram.runtime = "50M"
 
 [install]
     [install.domain]

scripts/upgrade

@@ -107,6 +107,7 @@ if [ "$cache" -eq 1 ]; then
     ynh_add_config --template="../conf/cache.conf" --destination="/etc/nginx/conf.d/$app-cache.conf"
     cat ../conf/media.conf >> ../conf/nginx.conf
 fi
+
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 

tests.toml

@@ -4,5 +4,4 @@ test_format = 1.0
 
 [default]
 
-    test_upgrade_from.e6d9935af254018baf326281662c55407170694d.name = "2.4.1"
     test_upgrade_from.ba16bc8bee7715c479a7ee575ec5f7d9970a84f8.name = "2.4.3"