Merge pull request #68 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,8 @@
 # All available README files by language
 
 - [Read the README in English](README.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)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -24,7 +24,7 @@ Modern web IRC client designed for self-hosting.
 - Responsive interface
 - Multi-user support
 
-**Shipped version:** 4.4.3~ynh2
+**Shipped version:** 4.4.3~ynh3
 
 **Demo:** <https://demo.thelounge.chat/>
 

README_es.md

@@ -0,0 +1,55 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# The Lounge para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/thelounge.svg)](https://dash.yunohost.org/appci/app/thelounge) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/thelounge.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/thelounge.maintain.svg)
+
+[![Instalar The Lounge con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=thelounge)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarThe Lounge 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
+
+Modern web IRC client designed for self-hosting. 
+
+### Features:
+
+- Always connected
+- Responsive interface
+- Multi-user support
+
+**Versión actual:** 4.4.3~ynh3
+
+**Demo:** <https://demo.thelounge.chat/>
+
+## Capturas
+
+![Captura de The Lounge](./doc/screenshots/thelounge-screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://thelounge.chat/>
+- Documentación administrador oficial: <https://thelounge.chat/docs>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/thelounge/thelounge>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/thelounge>
+- Reportar un error: <https://github.com/YunoHost-Apps/thelounge_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade thelounge -u https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -24,7 +24,7 @@ Modern web IRC client designed for self-hosting.
 - Responsive interface
 - Multi-user support
 
-**Paketatutako bertsioa:** 4.4.3~ynh2
+**Paketatutako bertsioa:** 4.4.3~ynh3
 
 **Demoa:** <https://demo.thelounge.chat/>
 

README_fr.md

@@ -24,7 +24,7 @@ Client Web IRC moderne conçu pour l'auto-hébergement.
 - Interface réactive
 - Support multi-utilisateurs 
 
-**Version incluse :** 4.4.3~ynh2
+**Version incluse :** 4.4.3~ynh3
 
 **Démo :** <https://demo.thelounge.chat/>
 

README_gl.md

@@ -24,7 +24,7 @@ Modern web IRC client designed for self-hosting.
 - Responsive interface
 - Multi-user support
 
-**Versión proporcionada:** 4.4.3~ynh2
+**Versión proporcionada:** 4.4.3~ynh3
 
 **Demo:** <https://demo.thelounge.chat/>
 

README_zh_Hans.md

@@ -0,0 +1,55 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 The Lounge
+
+[![集成程度](https://dash.yunohost.org/integration/thelounge.svg)](https://dash.yunohost.org/appci/app/thelounge) ![工作状态](https://ci-apps.yunohost.org/ci/badges/thelounge.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/thelounge.maintain.svg)
+
+[![使用 YunoHost 安装 The Lounge](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=thelounge)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 The Lounge。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Modern web IRC client designed for self-hosting. 
+
+### Features:
+
+- Always connected
+- Responsive interface
+- Multi-user support
+
+**分发版本：** 4.4.3~ynh3
+
+**演示：** <https://demo.thelounge.chat/>
+
+## 截图
+
+![The Lounge 的截图](./doc/screenshots/thelounge-screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://thelounge.chat/>
+- 官方管理文档： <https://thelounge.chat/docs>
+- 上游应用代码库： <https://github.com/thelounge/thelounge>
+- YunoHost 商店： <https://apps.yunohost.org/app/thelounge>
+- 报告 bug： <https://github.com/YunoHost-Apps/thelounge_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade thelounge -u https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/systemd.service

@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment="PATH=__ENV_PATH__"
+Environment="__YNH_NODE_LOAD_PATH__"
 Environment="THELOUNGE_HOME=__DATA_DIR__/"
 Environment="NODE_ENV=production"
 ExecStart=/usr/bin/yarn start

manifest.toml

@@ -5,9 +5,9 @@ name = "The Lounge"
 description.en = "Web IRC client"
 description.fr = "Client Web IRC"
 
-version = "4.4.3~ynh2"
+version = "4.4.3~ynh3"
 
-maintainers = ["rafi59"]
+maintainers = []
 
 [upstream]
 license = "MIT"

scripts/backup

@@ -32,10 +32,6 @@ ynh_backup --src_path="$data_dir" --is_big
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================

scripts/install

@@ -28,14 +28,6 @@ ynh_setup_source --dest_dir=$install_dir
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -45,6 +37,9 @@ ynh_script_progression --message="Modifying a config file..." --weight=1
 
 ynh_add_config --template="config.js" --destination="$data_dir/config.js"
 
+chmod 400 "$data_dir/config.js"
+chown "$app:$app" "$data_dir/config.js"
+
 #=================================================
 # INSTALL THE LOUNGE
 #=================================================
@@ -61,13 +56,10 @@ popd
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-env_path="$PATH"
+# Create a dedicated NGINX config
-ynh_add_systemd_config
+ynh_add_nginx_config
 
-#=================================================
+ynh_add_systemd_config
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
 yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log"
 

scripts/upgrade

@@ -55,7 +55,6 @@ ynh_script_progression --message="Upgrading system configurations related to $ap
 
 ynh_add_nginx_config
 
-env_path="$PATH"
 ynh_add_systemd_config
 
 yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log"