Merge pull request #100 from YunoHost-Apps/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 Node-RED with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodered)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Node-RED 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.*
@@ -47,7 +47,7 @@ logging: { // replace the default logging option ...defaultSettings.logging, //
 You can check the default settings Yunohost generates at `__INSTALL_DIR__/data/settings.js` and find the documentation for configuring Node-RED here: <https://nodered.org/docs/user-guide/runtime/configuration>
 
 
-**Shipped version:** 3.1.8~ynh1
+**Shipped version:** 3.1.9~ynh1
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,76 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Node-RED para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/nodered.svg)](https://dash.yunohost.org/appci/app/nodered) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/nodered.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/nodered.maintain.svg)
+
+[![Instalar Node-RED con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodered)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarNode-RED 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
+
+Node-RED is a programming tool for wiring together hardware devices, APIs and online services in new and interesting ways.
+
+It provides a browser-based editor that makes it easy to wire together flows using the wide range of nodes in the palette that can be deployed to its runtime in a single-click.
+
+### Features
+
+- Browser-based flow editing
+- On-click deployment of the flows
+- Over 225,000 modules available
+- Custom JavaScript functions can be written
+
+### Override the default settings
+
+From the installation directory, go edit the `__INSTALL_DIR__/data/settings.user.js`. For example:
+
+```js
+module.exports = (defaultSettings) => ({
+    lang: "de", // define the language as "de"
+    exportGlobalContextKeys: true, // override the `exportGlobalContextKeys` value
+logging: { // replace the default logging option ...defaultSettings.logging, // this will reinject the default settings in logging
+        console: {
+            ...defaultSettings.logging.level, // this will reinject the default settings in logging.console
+            level: "debug", // but here, we override the "info" level by "debug"
+        },
+    },
+});
+```
+
+You can check the default settings Yunohost generates at `__INSTALL_DIR__/data/settings.js` and find the documentation for configuring Node-RED here: <https://nodered.org/docs/user-guide/runtime/configuration>
+
+
+**Versión actual:** 3.1.9~ynh1
+
+## Capturas
+
+![Captura de Node-RED](./doc/screenshots/screenshot.jpg)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://nodered.org>
+- Documentación usuario oficial: <https://nodered.org/docs/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/node-red/node-red>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/nodered>
+- Reportar un error: <https://github.com/YunoHost-Apps/nodered_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/nodered_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade nodered -u https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,76 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Node-RED YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/nodered.svg)](https://dash.yunohost.org/appci/app/nodered) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/nodered.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/nodered.maintain.svg)
+
+[![Instalatu Node-RED YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodered)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Node-RED YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Node-RED is a programming tool for wiring together hardware devices, APIs and online services in new and interesting ways.
+
+It provides a browser-based editor that makes it easy to wire together flows using the wide range of nodes in the palette that can be deployed to its runtime in a single-click.
+
+### Features
+
+- Browser-based flow editing
+- On-click deployment of the flows
+- Over 225,000 modules available
+- Custom JavaScript functions can be written
+
+### Override the default settings
+
+From the installation directory, go edit the `__INSTALL_DIR__/data/settings.user.js`. For example:
+
+```js
+module.exports = (defaultSettings) => ({
+    lang: "de", // define the language as "de"
+    exportGlobalContextKeys: true, // override the `exportGlobalContextKeys` value
+logging: { // replace the default logging option ...defaultSettings.logging, // this will reinject the default settings in logging
+        console: {
+            ...defaultSettings.logging.level, // this will reinject the default settings in logging.console
+            level: "debug", // but here, we override the "info" level by "debug"
+        },
+    },
+});
+```
+
+You can check the default settings Yunohost generates at `__INSTALL_DIR__/data/settings.js` and find the documentation for configuring Node-RED here: <https://nodered.org/docs/user-guide/runtime/configuration>
+
+
+**Paketatutako bertsioa:** 3.1.9~ynh1
+
+## Pantaila-argazkiak
+
+![Node-RED(r)en pantaila-argazkia](./doc/screenshots/screenshot.jpg)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://nodered.org>
+- Erabiltzaileen dokumentazio ofiziala: <https://nodered.org/docs/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/node-red/node-red>
+- YunoHost Denda: <https://apps.yunohost.org/app/nodered>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/nodered_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/nodered_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade nodered -u https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -49,7 +49,7 @@ module.exports = (defaultSettings) => ({
 Vous pouvez consulter les paramètres par défaut générez par Yunohost dans `__INSTALL_DIR__/data/settings.js` et trouver la documentation pour configurer Node-RED ici: <https://nodered.org/docs/user-guide/runtime/configuration>
 
 
-**Version incluse :** 3.1.8~ynh1
+**Version incluse :** 3.1.9~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -47,7 +47,7 @@ logging: { // replace the default logging option ...defaultSettings.logging, //
 You can check the default settings Yunohost generates at `__INSTALL_DIR__/data/settings.js` and find the documentation for configuring Node-RED here: <https://nodered.org/docs/user-guide/runtime/configuration>
 
 
-**Versión proporcionada:** 3.1.8~ynh1
+**Versión proporcionada:** 3.1.9~ynh1
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -0,0 +1,76 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Node-RED
+
+[![集成程度](https://dash.yunohost.org/integration/nodered.svg)](https://dash.yunohost.org/appci/app/nodered) ![工作状态](https://ci-apps.yunohost.org/ci/badges/nodered.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/nodered.maintain.svg)
+
+[![使用 YunoHost 安装 Node-RED](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nodered)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Node-RED。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Node-RED is a programming tool for wiring together hardware devices, APIs and online services in new and interesting ways.
+
+It provides a browser-based editor that makes it easy to wire together flows using the wide range of nodes in the palette that can be deployed to its runtime in a single-click.
+
+### Features
+
+- Browser-based flow editing
+- On-click deployment of the flows
+- Over 225,000 modules available
+- Custom JavaScript functions can be written
+
+### Override the default settings
+
+From the installation directory, go edit the `__INSTALL_DIR__/data/settings.user.js`. For example:
+
+```js
+module.exports = (defaultSettings) => ({
+    lang: "de", // define the language as "de"
+    exportGlobalContextKeys: true, // override the `exportGlobalContextKeys` value
+logging: { // replace the default logging option ...defaultSettings.logging, // this will reinject the default settings in logging
+        console: {
+            ...defaultSettings.logging.level, // this will reinject the default settings in logging.console
+            level: "debug", // but here, we override the "info" level by "debug"
+        },
+    },
+});
+```
+
+You can check the default settings Yunohost generates at `__INSTALL_DIR__/data/settings.js` and find the documentation for configuring Node-RED here: <https://nodered.org/docs/user-guide/runtime/configuration>
+
+
+**分发版本：** 3.1.9~ynh1
+
+## 截图
+
+![Node-RED 的截图](./doc/screenshots/screenshot.jpg)
+
+## 文档与资源
+
+- 官方应用网站： <https://nodered.org>
+- 官方用户文档： <https://nodered.org/docs/>
+- 上游应用代码库： <https://github.com/node-red/node-red>
+- YunoHost 商店： <https://apps.yunohost.org/app/nodered>
+- 报告 bug： <https://github.com/YunoHost-Apps/nodered_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/nodered_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade nodered -u https://github.com/YunoHost-Apps/nodered_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/nginx.conf

@@ -12,7 +12,7 @@ location ^~ __PATH__/ {
   proxy_set_header Connection "Upgrade";
 
   # Enable websockets (see: https://github.com/YunoHost-Apps/nodered_ynh/issues/78 )
-  more_set_headers "Content-Security-Policy : upgrade-insecure-requests; default-src https: data: blob: ; connect-src 'self' wss://$host; object-src https: data: 'unsafe-inline'; style-src https: data: 'unsafe-inline' ; script-src https: data: 'unsafe-inline' 'unsafe-eval'; worker-src 'self' blob:;";
+    more_set_headers "Content-Security-Policy : upgrade-insecure-requests; default-src https: data: blob: ; connect-src 'self' wss://$host https://catalogue.nodered.org/; object-src https: data: 'unsafe-inline'; style-src https: data: 'unsafe-inline' ; script-src https: data: 'unsafe-inline' 'unsafe-eval'; worker-src 'self' blob:;";
 
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;

conf/systemd.service

@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__YNH_NODE__ red.js -p __PORT__ -u __INSTALL_DIR__/data
-StandardOutput=syslog
+StandardOutput=journal
 StandardError=inherit
 
 # Sandboxing options to harden security

manifest.toml

@@ -7,7 +7,7 @@ name = "Node-RED"
 description.en = "Flow-based programming for the Internet of Things"
 description.fr = "Programmation par flux de données pour l'Internet des objets"
 
-version = "3.1.8~ynh1"
+version = "3.1.9~ynh1"
 
 maintainers = ["tituspijean"]
 
@@ -37,19 +37,22 @@ ram.runtime = "70M"
     type = "path"
     default = "/nodered"
 
-    [install.admin]
+    [install.init_admin_permission]
-    type = "user"
+    ask.en = "For example, to edit flows"
+    ask.fr = "Par exemple, pour modifier les flux"
+    type = "group"
+    default = "admins"
 
     [install.init_main_permission]
-    help.en = "Should the dashboard and HTTP endpoints be publicly accessible?"
+    help.en = "This corresponds to access to the dashboard and HTTP endpoints"
-    help.fr = "Le tableau de bord et les points d'accès HTTP doivent-ils être publiquement accessibles ?"
+    help.fr = "Ceci corresponds à l'accès au tableau de bord et aux points d'accès HTTP"
     type = "group"
-    default = false
+    default = "visitors"
 
 [resources]
     [resources.sources.main]
-    url = "https://github.com/node-red/node-red/releases/download/3.1.8/node-red-3.1.8.zip"
+    url = "https://github.com/node-red/node-red/releases/download/3.1.9/node-red-3.1.9.zip"
-    sha256 = "d1e90ca9ac7bd73fce48945428f7697f070217eb7b60279be95a732205bc3b0d"
+    sha256 = "420cbaaa6499ce5d5b9fb3e6bac0ffc24b23eb02f3dc8f4491207015dc7c6052"
 
     autoupdate.strategy = "latest_github_release"
     autoupdate.asset = "node-red-.*zip"

tests.toml

@@ -8,8 +8,10 @@ test_format = 1.0
 # Commits to test upgrade from
 # -------------------------------
 
-    [default.test_upgrade_from.3dae97a7]
+    [default.test_upgrade_from.6eb3cdb]
-    name = "3.0.2~ynh2"
+    name = "3.1.8~ynh1"
-
+    args.domain = "sub.domain.tld"
-    [default.test_upgrade_from.ca5545af]
+    args.path = "/"
-    name = "3.1.4~ynh1 (update nodejs 16 to 20)"
+    args.init_main_permission = "visitors"
+    args.init_admin_permission = "package_checker"
+    args.admin = "package_checker"