Merge b20ee90ad1 into c47b149a11

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 Shell In A Box with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shellinabox)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Shell In A Box 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.
 Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins.
 
 
-**Shipped version:** 2.21~ynh4
+**Shipped version:** 2.21~ynh5
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,49 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Shell In A Box para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/shellinabox.svg)](https://dash.yunohost.org/appci/app/shellinabox) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/shellinabox.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/shellinabox.maintain.svg)
+
+[![Instalar Shell In A Box con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shellinabox)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarShell In A Box 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
+
+Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins.
+
+
+**Versión actual:** 2.21~ynh5
+
+## Capturas
+
+![Captura de Shell In A Box](./doc/screenshots/screenshot.gif)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://code.google.com/archive/p/shellinabox/>
+- Documentación usuario oficial: <https://code.google.com/p/shellinabox/wiki/shellinaboxd_man>
+- Documentación administrador oficial: <https://github.com/shellinabox/shellinabox/wiki/shellinaboxd_man>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/shellinabox/shellinabox>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/shellinabox>
+- Reportar un error: <https://github.com/YunoHost-Apps/shellinabox_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade shellinabox -u https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,49 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Shell In A Box YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/shellinabox.svg)](https://dash.yunohost.org/appci/app/shellinabox) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/shellinabox.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/shellinabox.maintain.svg)
+
+[![Instalatu Shell In A Box YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shellinabox)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Shell In A Box YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins.
+
+
+**Paketatutako bertsioa:** 2.21~ynh5
+
+## Pantaila-argazkiak
+
+![Shell In A Box(r)en pantaila-argazkia](./doc/screenshots/screenshot.gif)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://code.google.com/archive/p/shellinabox/>
+- Erabiltzaileen dokumentazio ofiziala: <https://code.google.com/p/shellinabox/wiki/shellinaboxd_man>
+- Administratzaileen dokumentazio ofiziala: <https://github.com/shellinabox/shellinabox/wiki/shellinaboxd_man>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/shellinabox/shellinabox>
+- YunoHost Denda: <https://apps.yunohost.org/app/shellinabox>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/shellinabox_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade shellinabox -u https://github.com/YunoHost-Apps/shellinabox_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.
 Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins.
 
 
-**Version incluse :** 2.21~ynh4
+**Version incluse :** 2.21~ynh5
 
 ## Captures d’écran
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins.
 
 
-**Versión proporcionada:** 2.21~ynh4
+**Versión proporcionada:** 2.21~ynh5
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -0,0 +1,49 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Shell In A Box
+
+[![集成程度](https://dash.yunohost.org/integration/shellinabox.svg)](https://dash.yunohost.org/appci/app/shellinabox) ![工作状态](https://ci-apps.yunohost.org/ci/badges/shellinabox.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/shellinabox.maintain.svg)
+
+[![使用 YunoHost 安装 Shell In A Box](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shellinabox)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Shell In A Box。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Shell In A Box implements a web server that can export arbitrary command line tools to a web based terminal emulator. This emulator is accessible to any JavaScript and CSS enabled web browser and does not require any additional browser plugins.
+
+
+**分发版本：** 2.21~ynh5
+
+## 截图
+
+![Shell In A Box 的截图](./doc/screenshots/screenshot.gif)
+
+## 文档与资源
+
+- 官方应用网站： <https://code.google.com/archive/p/shellinabox/>
+- 官方用户文档： <https://code.google.com/p/shellinabox/wiki/shellinaboxd_man>
+- 官方管理文档： <https://github.com/shellinabox/shellinabox/wiki/shellinaboxd_man>
+- 上游应用代码库： <https://github.com/shellinabox/shellinabox>
+- YunoHost 商店： <https://apps.yunohost.org/app/shellinabox>
+- 报告 bug： <https://github.com/YunoHost-Apps/shellinabox_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade shellinabox -u https://github.com/YunoHost-Apps/shellinabox_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/nginx.conf

@@ -1,7 +1,7 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-  proxy_pass http://127.0.0.1:__PORT__/;
+  proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header Host $host;
   proxy_buffering off;
   tcp_nodelay on;

conf/shellinabox

@@ -6,9 +6,9 @@ SHELLINABOX_PORT=__PORT__
 
 # Parameters that are managed by the system and usually should not need
 # changing:
-# SHELLINABOX_DATA_DIR=/var/lib/shellinabox
+# SHELLINABOX_DATADIR=/var/lib/shellinabox
-# SHELLINABOX_USER=shellinabox
+SHELLINABOX_USER=__APP__
-# SHELLINABOX_GROUP=shellinabox
+SHELLINABOX_GROUP=__APP__
 
 # Any optional arguments (e.g. extra service definitions).  Make sure
 # that that argument is quoted.

manifest.toml

@@ -5,7 +5,7 @@ name = "Shell In A Box"
 description.en = "Web based AJAX terminal emulator"
 description.fr = "Émulateur de terminal web"
 
-version = "2.21~ynh4"
+version = "2.21~ynh5"
 
 maintainers = []
 
@@ -17,7 +17,7 @@ userdoc = "https://code.google.com/p/shellinabox/wiki/shellinaboxd_man"
 code = "https://github.com/shellinabox/shellinabox"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
 ldap = false
@@ -36,11 +36,14 @@ ram.runtime = "50M"
 
 [resources]
 
+    [resources.system_user]
+
     [resources.ports]
-    main.default = 4200
 
     [resources.permissions]
     main.url = "/"
+    main.allowed = "admins"
+    main.protected = true
 
     [resources.apt]
     packages = "shellinabox"

scripts/install

@@ -42,7 +42,7 @@ systemctl daemon-reload
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Web based AJAX terminal emulator"
+yunohost service add $app --description="Web based AJAX terminal emulator" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -50,7 +50,7 @@ yunohost service add $app --description="Web based AJAX terminal emulator"
 ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
-ynh_systemd_action --service_name=shellinabox --action=restart
+ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT

scripts/restore

@@ -40,14 +40,14 @@ systemctl daemon-reload
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Web based AJAX terminal emulator"
+yunohost service add $app --description="Web based AJAX terminal emulator" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=shellinabox --action=restart
+ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/upgrade

@@ -22,7 +22,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -54,14 +54,14 @@ systemctl daemon-reload
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Web based AJAX terminal emulator"
+yunohost service add $app --description="Web based AJAX terminal emulator" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=shellinabox --action=restart
+ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT

tests.toml

@@ -5,3 +5,5 @@ test_format = 1.0
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------
+
+    test_upgrade_from.86375c3948e425220b388a147582e6c1058858ee.name = "Upgrade from 2.21~ynh3"