Merge pull request #61 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)
+- [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)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install NodeBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodebb)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install NodeBB 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.*
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
 Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
 
-**Shipped version:** 3.5.0~ynh1
+**Shipped version:** 3.7.3~ynh1
 
 **Demo:** <https://try.nodebb.org>
 

README_es.md

@@ -0,0 +1,50 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# NodeBB para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/nodebb.svg)](https://dash.yunohost.org/appci/app/nodebb) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/nodebb.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/nodebb.maintain.svg)
+
+[![Instalar NodeBB con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodebb)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarNodeBB 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
+
+NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
+Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
+
+**Versión actual:** 3.7.3~ynh1
+
+**Demo:** <https://try.nodebb.org>
+
+## Capturas
+
+![Captura de NodeBB](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://nodebb.org>
+- Documentación administrador oficial: <https://docs.nodebb.org>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/NodeBB/NodeBB>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/nodebb>
+- Reportar un error: <https://github.com/YunoHost-Apps/nodebb_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade nodebb -u https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,50 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# NodeBB YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/nodebb.svg)](https://dash.yunohost.org/appci/app/nodebb) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/nodebb.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/nodebb.maintain.svg)
+
+[![Instalatu NodeBB YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodebb)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek NodeBB YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
+Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
+
+**Paketatutako bertsioa:** 3.7.3~ynh1
+
+**Demoa:** <https://try.nodebb.org>
+
+## Pantaila-argazkiak
+
+![NodeBB(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://nodebb.org>
+- Administratzaileen dokumentazio ofiziala: <https://docs.nodebb.org>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/NodeBB/NodeBB>
+- YunoHost Denda: <https://apps.yunohost.org/app/nodebb>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/nodebb_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade nodebb -u https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
 Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
 
-**Version incluse :** 3.5.0~ynh1
+**Version incluse :** 3.7.3~ynh1
 
 **Démo :** <https://try.nodebb.org>
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
 Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
 
-**Versión proporcionada:** 3.5.0~ynh1
+**Versión proporcionada:** 3.7.3~ynh1
 
 **Demo:** <https://try.nodebb.org>
 

README_zh_Hans.md

@@ -0,0 +1,50 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 NodeBB
+
+[![集成程度](https://dash.yunohost.org/integration/nodebb.svg)](https://dash.yunohost.org/appci/app/nodebb) ![工作状态](https://ci-apps.yunohost.org/ci/badges/nodebb.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/nodebb.maintain.svg)
+
+[![使用 YunoHost 安装 NodeBB](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodebb)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 NodeBB。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
+Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
+
+**分发版本：** 3.7.3~ynh1
+
+**演示：** <https://try.nodebb.org>
+
+## 截图
+
+![NodeBB 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://nodebb.org>
+- 官方管理文档： <https://docs.nodebb.org>
+- 上游应用代码库： <https://github.com/NodeBB/NodeBB>
+- YunoHost 商店： <https://apps.yunohost.org/app/nodebb>
+- 报告 bug： <https://github.com/YunoHost-Apps/nodebb_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade nodebb -u https://github.com/YunoHost-Apps/nodebb_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

manifest.toml

@@ -5,9 +5,9 @@ name = "NodeBB"
 description.en = "Forum software built for the modern web"
 description.fr = "Logiciel de forum conçu pour le Web moderne"
 
-version = "3.5.0~ynh1"
+version = "3.7.3~ynh1"
 
-maintainers = [""]
+maintainers = []
 
 [upstream]
 license = "GPL-3.0"
@@ -20,8 +20,11 @@ code = "https://github.com/NodeBB/NodeBB"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"

scripts/install

@@ -57,7 +57,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Configuring the app..." --weight=2
 
-ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
+ynh_add_config --template="config.json" --destination="$install_dir/config.json"
 
 setup="{
 		\"admin:username\": \"$admin\",
@@ -84,21 +84,9 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=1
-
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log"
 
 #=================================================

scripts/remove

@@ -22,35 +22,15 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --weight=1
-
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
 # Remove metapackage and its dependencies
 ynh_remove_nodejs
 

scripts/restore

@@ -10,15 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..."
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -51,14 +42,11 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 #=================================================
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log"
 
 #=================================================
@@ -68,13 +56,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -11,12 +11,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -29,12 +23,9 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+pushd $install_dir
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	pushd $install_dir
 	ynh_use_nodejs
 	# Shut down your forum
 	git config --system --add safe.directory $install_dir
@@ -44,8 +35,7 @@ then
 	git reset --hard origin/$nodebb_version		# Replace v1.12.x with the branch name!
 	# Run the NodeBB upgrade script
 	ynh_exec_as $app $ynh_node_load_PATH $install_dir/nodebb upgrade 2>/dev/null 
-	popd
+popd
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -58,27 +48,12 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
-
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log"
 
 #=================================================