From a849fe267677b8fc1848fd5020e447d077b11c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:21:47 +0200 Subject: [PATCH 01/41] fix --- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 6342e63..a96caf3 100644 --- a/scripts/install +++ b/scripts/install @@ -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 diff --git a/scripts/restore b/scripts/restore index 81b5b2e..25a53c4 100644 --- a/scripts/restore +++ b/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=start --log_path="systemd" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index b008c8a..09cc171 100644 --- a/scripts/upgrade +++ b/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=start --log_path="systemd" #================================================= # END OF SCRIPT From 3cee71508338ae7c9d5d6cbcf71132e472fb9489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 5 Jun 2023 21:23:11 +0200 Subject: [PATCH 02/41] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a96caf3..57ed8f3 100644 --- a/scripts/install +++ b/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 From 6058b46a54c6f748861460a07c8d241b3c21e5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:26:52 +0200 Subject: [PATCH 03/41] Update shellinabox --- conf/shellinabox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/shellinabox b/conf/shellinabox index ef1e5c0..c5d47db 100644 --- a/conf/shellinabox +++ b/conf/shellinabox @@ -6,7 +6,7 @@ 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_GROUP=shellinabox From 18f23432b8a09c202e5c7d8060ff4263af3e7bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:33:40 +0200 Subject: [PATCH 04/41] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5235e96..93e2c4b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -39,8 +39,8 @@ ram.runtime = "50M" [resources.ports] main.default = 4200 - [resources.permissions] - main.url = "/" + #[resources.permissions] + #main.url = "/" [resources.apt] packages = "shellinabox" From 381199880d58db812cc5d3692781a586dcf5ebc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:44:08 +0200 Subject: [PATCH 05/41] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 93e2c4b..a562e06 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,10 +37,10 @@ ram.runtime = "50M" [resources] [resources.ports] - main.default = 4200 + #main.default = 4200 - #[resources.permissions] - #main.url = "/" + [resources.permissions] + main.url = "/" [resources.apt] packages = "shellinabox" From 8402f2613f2e5bc23adc6aaa5a84e0a47083efda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:45:08 +0200 Subject: [PATCH 06/41] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index a562e06..ea62a95 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,6 +41,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + main.show_tile = true [resources.apt] packages = "shellinabox" From d1127337ffaa3252f2dbcb23e81bb358802e5acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:08:27 +0200 Subject: [PATCH 07/41] Update manifest.toml --- manifest.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index ea62a95..5235e96 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,11 +37,10 @@ ram.runtime = "50M" [resources] [resources.ports] - #main.default = 4200 + main.default = 4200 [resources.permissions] main.url = "/" - main.show_tile = true [resources.apt] packages = "shellinabox" From 3006f687d3a2e32631b8aaeb88ffff884174411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:49:18 +0200 Subject: [PATCH 08/41] Update manifest.toml --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index 5235e96..37f94b0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -36,6 +36,8 @@ ram.runtime = "50M" [resources] + [resources.system_user] + [resources.ports] main.default = 4200 From 2497b49bc3599ee44ffbcc30d3ca233ce43562c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:51:00 +0200 Subject: [PATCH 09/41] Update manifest.toml --- manifest.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 37f94b0..5235e96 100644 --- a/manifest.toml +++ b/manifest.toml @@ -36,8 +36,6 @@ ram.runtime = "50M" [resources] - [resources.system_user] - [resources.ports] main.default = 4200 From e443105be3c43e59c94a75c887fb0b37c335b1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:12:11 +0200 Subject: [PATCH 10/41] Update manifest.toml --- manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index 5235e96..3352d18 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,6 +34,10 @@ ram.runtime = "50M" type = "path" default = "/ssh" + [install.init_main_permission] + type = "group" + default = "admins" + [resources] [resources.ports] From 44d4d9d94547fb2cde9052da7950dc832cbe16a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:15:55 +0200 Subject: [PATCH 11/41] Update manifest.toml --- manifest.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3352d18..a6a65d3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,9 +34,12 @@ ram.runtime = "50M" type = "path" default = "/ssh" - [install.init_main_permission] - type = "group" - default = "admins" + #[install.init_main_permission] + #type = "group" + #default = "admins" + + [install.admin] + type = "user" [resources] From 10c711c8a36e7ffc752580eb4b8a676c941ecccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:18:01 +0200 Subject: [PATCH 12/41] Update manifest.toml --- manifest.toml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index a6a65d3..3352d18 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,12 +34,9 @@ ram.runtime = "50M" type = "path" default = "/ssh" - #[install.init_main_permission] - #type = "group" - #default = "admins" - - [install.admin] - type = "user" + [install.init_main_permission] + type = "group" + default = "admins" [resources] From 27addce56b2121f760907d23667054f0403f0eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:30:51 +0200 Subject: [PATCH 13/41] Update manifest.toml --- manifest.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3352d18..2543638 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,10 +34,6 @@ ram.runtime = "50M" type = "path" default = "/ssh" - [install.init_main_permission] - type = "group" - default = "admins" - [resources] [resources.ports] @@ -45,6 +41,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + main.allowed = "admins" [resources.apt] packages = "shellinabox" From 67c73346b3248ca13f84bd95f9215984b87bbdf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:35:06 +0200 Subject: [PATCH 14/41] Update manifest.toml --- manifest.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2543638..d554d9e 100644 --- a/manifest.toml +++ b/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 = [] @@ -42,6 +42,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" main.allowed = "admins" + main.protected = true [resources.apt] packages = "shellinabox" From e09124f41356d2acc344212bb87b615ac10d935e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 6 Jun 2023 09:35:11 +0000 Subject: [PATCH 15/41] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bda4005..9a766b3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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 diff --git a/README_fr.md b/README_fr.md index 91a29ef..847e66d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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 From 9730b4e9f7ca7c42a1399c571b3bb04934335a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:35:46 +0200 Subject: [PATCH 16/41] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d554d9e..8bdbe32 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,7 +37,6 @@ ram.runtime = "50M" [resources] [resources.ports] - main.default = 4200 [resources.permissions] main.url = "/" From 0b52dae77a30a458335846a42159f0621ca791fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:26:02 +0200 Subject: [PATCH 17/41] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 8bdbe32..d554d9e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,6 +37,7 @@ ram.runtime = "50M" [resources] [resources.ports] + main.default = 4200 [resources.permissions] main.url = "/" From fa99bc87191a771913f4fb5eb43549bade255a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:29:48 +0200 Subject: [PATCH 18/41] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 25a53c4..cac0205 100644 --- a/scripts/restore +++ b/scripts/restore @@ -47,7 +47,7 @@ yunohost service add $app --description="Web based AJAX terminal emulator" --log #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=shellinabox --action=start --log_path="systemd" +ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd" #================================================= # GENERIC FINALIZATION From a8bdde447242faf8a654814d4c02879664b6269f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:30:52 +0200 Subject: [PATCH 19/41] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 09cc171..916d3f3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,7 +61,7 @@ yunohost service add $app --description="Web based AJAX terminal emulator" --log #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=shellinabox --action=start --log_path="systemd" +ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd" #================================================= # END OF SCRIPT From 2f2abb9ac01b4d9646f01cfcaf4dd288cf42de61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:39:46 +0200 Subject: [PATCH 20/41] Update tests.toml --- tests.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests.toml b/tests.toml index 96b1075..d4589d0 100644 --- a/tests.toml +++ b/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" \ No newline at end of file From eba36184704558e81c4a75897c348196636327ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Jun 2023 17:23:41 +0200 Subject: [PATCH 21/41] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d554d9e..8bdbe32 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,7 +37,6 @@ ram.runtime = "50M" [resources] [resources.ports] - main.default = 4200 [resources.permissions] main.url = "/" From 81716327708c8d198525ab361ddbbc0e7eedc5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 1 Sep 2023 14:06:51 +0200 Subject: [PATCH 22/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8bdbe32..e67c6ad 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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 From 4ac6a3ccd3a08a517e70cfd93ba97f0ecbd21d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 1 Sep 2023 14:07:44 +0200 Subject: [PATCH 23/41] Update manifest.toml --- manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index e67c6ad..3a5b327 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,6 +30,10 @@ ram.runtime = "50M" [install.domain] type = "domain" + [install.init_main_permission] + type = "group" + default = "admins" + [install.path] type = "path" default = "/ssh" From 40b31f422a6fda0e1787fd1da585b93f3b1a46da Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 10 Sep 2023 14:36:43 +0200 Subject: [PATCH 24/41] Update manifest.toml : add system user resource --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index 3a5b327..8cd2ace 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,6 +40,8 @@ ram.runtime = "50M" [resources] + [resources.system_user] + [resources.ports] [resources.permissions] From ac3471adbd8dbf91b6ffff687a5e63ca3b2bbc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Sep 2023 21:23:17 +0200 Subject: [PATCH 25/41] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8cd2ace..12d3158 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,7 +47,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" main.allowed = "admins" - main.protected = true + #main.protected = true [resources.apt] packages = "shellinabox" From fc6f23fae6cacf23db6df088c01dceacadd3491e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Sep 2023 21:46:03 +0200 Subject: [PATCH 26/41] Update manifest.toml --- manifest.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 12d3158..a87ef6c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,11 +43,12 @@ ram.runtime = "50M" [resources.system_user] [resources.ports] + main.default = 4200 [resources.permissions] main.url = "/" main.allowed = "admins" - #main.protected = true + main.protected = true [resources.apt] packages = "shellinabox" From 6de26036893fc2fac454c091510ded78bd600e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Sep 2023 21:54:11 +0200 Subject: [PATCH 27/41] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index a87ef6c..ed8086c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,9 +30,9 @@ ram.runtime = "50M" [install.domain] type = "domain" - [install.init_main_permission] - type = "group" - default = "admins" + #[install.init_main_permission] + #type = "group" + #default = "admins" [install.path] type = "path" From 5ea5722418e393c636c32cc1df1fc33a79757ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 10 Sep 2023 21:57:37 +0200 Subject: [PATCH 28/41] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ed8086c..a87ef6c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,9 +30,9 @@ ram.runtime = "50M" [install.domain] type = "domain" - #[install.init_main_permission] - #type = "group" - #default = "admins" + [install.init_main_permission] + type = "group" + default = "admins" [install.path] type = "path" From be37c819112288284c699b961e7c11b5ba0de9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:51:42 +0200 Subject: [PATCH 29/41] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index a87ef6c..a474177 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,14 +30,14 @@ ram.runtime = "50M" [install.domain] type = "domain" - [install.init_main_permission] - type = "group" - default = "admins" - [install.path] type = "path" default = "/ssh" + [install.init_main_permission] + type = "group" + default = "admins" + [resources] [resources.system_user] From 2ed4f44fec463f649672c51a18a0788c2bfab735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:54:14 +0200 Subject: [PATCH 30/41] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index a474177..53b143e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,8 +47,8 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.allowed = "admins" - main.protected = true + #main.allowed = "admins" + #main.protected = true [resources.apt] packages = "shellinabox" From 51c280e517cdef3a413404de44939f8a24a898df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:02:58 +0200 Subject: [PATCH 31/41] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 53b143e..a474177 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,8 +47,8 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - #main.allowed = "admins" - #main.protected = true + main.allowed = "admins" + main.protected = true [resources.apt] packages = "shellinabox" From c3d1da54c19daa1184a910586d94849c2cf313eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:04:20 +0200 Subject: [PATCH 32/41] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a474177..04aee65 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,6 @@ ram.runtime = "50M" [resources.system_user] [resources.ports] - main.default = 4200 [resources.permissions] main.url = "/" From 2e953952405620918f8e034c90669b54084e5e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:08:31 +0200 Subject: [PATCH 33/41] Update shellinabox --- conf/shellinabox | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/shellinabox b/conf/shellinabox index c5d47db..c5522f6 100644 --- a/conf/shellinabox +++ b/conf/shellinabox @@ -7,8 +7,8 @@ SHELLINABOX_PORT=__PORT__ # Parameters that are managed by the system and usually should not need # changing: # SHELLINABOX_DATADIR=/var/lib/shellinabox -# SHELLINABOX_USER=shellinabox -# SHELLINABOX_GROUP=shellinabox +SHELLINABOX_USER=__APP__ +SHELLINABOX_GROUP=__APP__ # Any optional arguments (e.g. extra service definitions). Make sure # that that argument is quoted. From 7ae7538fae2d3b475557679a5b24864d42f5cfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:14:55 +0200 Subject: [PATCH 34/41] Update shellinabox --- conf/shellinabox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/shellinabox b/conf/shellinabox index c5522f6..0b149cb 100644 --- a/conf/shellinabox +++ b/conf/shellinabox @@ -15,4 +15,4 @@ SHELLINABOX_GROUP=__APP__ # # Beeps are disabled because of reports of the VLC plugin crashing # Firefox on Linux/x86_64. -SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl" +SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl –cert-fd=fd" From 269aa7dcf8b2094c67cc5ca80a7e9a8b9b46f341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:24:40 +0200 Subject: [PATCH 35/41] fix --- conf/nginx.conf | 2 +- conf/shellinabox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9f677b0..9a1f034 100644 --- a/conf/nginx.conf +++ b/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; diff --git a/conf/shellinabox b/conf/shellinabox index 0b149cb..c5522f6 100644 --- a/conf/shellinabox +++ b/conf/shellinabox @@ -15,4 +15,4 @@ SHELLINABOX_GROUP=__APP__ # # Beeps are disabled because of reports of the VLC plugin crashing # Firefox on Linux/x86_64. -SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl –cert-fd=fd" +SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl" From e19963224447d255a88396c36b02f92171978881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:30:42 +0200 Subject: [PATCH 36/41] Update shellinabox --- conf/shellinabox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/shellinabox b/conf/shellinabox index c5522f6..c62bb3b 100644 --- a/conf/shellinabox +++ b/conf/shellinabox @@ -15,4 +15,4 @@ SHELLINABOX_GROUP=__APP__ # # Beeps are disabled because of reports of the VLC plugin crashing # Firefox on Linux/x86_64. -SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl" +#SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl" From fb3aba942475faedf3eb108241665d23cb043d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:33:44 +0200 Subject: [PATCH 37/41] Update shellinabox --- conf/shellinabox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/shellinabox b/conf/shellinabox index c62bb3b..c5522f6 100644 --- a/conf/shellinabox +++ b/conf/shellinabox @@ -15,4 +15,4 @@ SHELLINABOX_GROUP=__APP__ # # Beeps are disabled because of reports of the VLC plugin crashing # Firefox on Linux/x86_64. -#SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl" +SHELLINABOX_ARGS="--no-beep --localhost-only --disable-ssl" From 7101e928f76981cdb21e15887efa3c8ef9e0cc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:12:02 +0200 Subject: [PATCH 38/41] Update install --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 57ed8f3..f128469 100644 --- a/scripts/install +++ b/scripts/install @@ -26,6 +26,9 @@ ynh_script_progression --message="Adding a configuration file..." --weight=2 ynh_add_config --template="../conf/shellinabox" --destination="/etc/default/shellinabox" +chmod 400 "/etc/default/shellinabox" +chown $app:$app "/etc/default/shellinabox" + #================================================= # SETUP SYSTEMD #================================================= @@ -50,7 +53,7 @@ yunohost service add $app --description="Web based AJAX terminal emulator" --log ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd" +ynh_systemd_action --service_name=$app --action=restart --log_path="systemd" #================================================= # END OF SCRIPT From 48dee229fe849bdd3c8c5e54789895f375484f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:14:53 +0200 Subject: [PATCH 39/41] Revert "Update install" This reverts commit 7101e928f76981cdb21e15887efa3c8ef9e0cc83. --- scripts/install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index f128469..57ed8f3 100644 --- a/scripts/install +++ b/scripts/install @@ -26,9 +26,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=2 ynh_add_config --template="../conf/shellinabox" --destination="/etc/default/shellinabox" -chmod 400 "/etc/default/shellinabox" -chown $app:$app "/etc/default/shellinabox" - #================================================= # SETUP SYSTEMD #================================================= @@ -53,7 +50,7 @@ yunohost service add $app --description="Web based AJAX terminal emulator" --log ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --log_path="systemd" +ynh_systemd_action --service_name=shellinabox --action=restart --log_path="systemd" #================================================= # END OF SCRIPT From 3c0016653d70c36b541fc2f5eda26926fbb639fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:24:59 +0200 Subject: [PATCH 40/41] Update manifest.toml --- manifest.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 04aee65..0193f72 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,10 +34,6 @@ ram.runtime = "50M" type = "path" default = "/ssh" - [install.init_main_permission] - type = "group" - default = "admins" - [resources] [resources.system_user] From b20ee90ad134b5f3fd50f4e20876d079884d00a6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 May 2024 09:13:34 +0000 Subject: [PATCH 41/41] Auto-update READMEs --- ALL_README.md | 4 +++- README.md | 2 +- README_es.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 4 deletions(-) create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..8938aae 100644 --- a/ALL_README.md +++ b/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) diff --git a/README.md b/README.md index 32b1c72..2923c6c 100644 --- a/README.md +++ b/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.* diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..3c1a500 --- /dev/null +++ b/README_es.md @@ -0,0 +1,49 @@ + + +# 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: +- Documentación usuario oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## 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:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..a1fb8f6 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,49 @@ + + +# 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: +- Erabiltzaileen dokumentazio ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## 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:** diff --git a/README_fr.md b/README_fr.md index 7fa62b4..2987250 100644 --- a/README_fr.md +++ b/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~ynh5 +**Version incluse :** 2.21~ynh5 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 739863b..1b37bc9 100644 --- a/README_gl.md +++ b/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 diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..f50b8eb --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,49 @@ + + +# 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) + +## 文档与资源 + +- 官方应用网站： +- 官方用户文档： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`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 +``` + +**有关应用打包的更多信息：**