From f9a4bd40d89eba61d1cbe8189f8db699d7dd913f Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 19:47:01 +0200 Subject: [PATCH 1/7] add manual port change at install add the feature to change the portrange for tunnels manual on install --- manifest.json | 18 ++++++++++++++++++ scripts/install | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 2b57702..1097d35 100644 --- a/manifest.json +++ b/manifest.json @@ -40,6 +40,24 @@ "name": "password", "type": "password" } + { + "name": "first port" + "type": "firstport" + "ask": { + "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)"" + "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" + }, + "example": "20000" + }, + { + "name": "last port" + "type": "lastport" + "ask": { + "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)"" + "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 30000)" + }, + "example": "30000" + } ] } } diff --git a/scripts/install b/scripts/install index 43ab9ca..abe1c38 100755 --- a/scripts/install +++ b/scripts/install @@ -76,9 +76,9 @@ ynh_app_setting_set --app=$app --key=api_port --value=$api_port guacd_port=$(ynh_find_port --port=$(($api_port + 1))) ynh_app_setting_set --app=$app --key=guacd_port --value=$guacd_port -used_start_port=$(ynh_find_port --port=20000) +used_start_port=$YNH_APP_ARG_FIRSTPORT ynh_app_setting_set --app=$app --key=used_start_port --value=$used_start_port -used_end_port=$(ynh_find_port --port=30000) +used_end_port=$YNH_APP_ARG_LASTPORT ynh_app_setting_set --app=$app --key=used_end_port --value=$used_end_port ynh_exec_warn_less yunohost firewall allow TCP $used_start_port:$used_end_port From 7182a238aea588496277f9c1ba2deb04f8018ee6 Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 20:00:35 +0200 Subject: [PATCH 2/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1097d35..f919146 100644 --- a/manifest.json +++ b/manifest.json @@ -39,7 +39,7 @@ { "name": "password", "type": "password" - } + }, { "name": "first port" "type": "firstport" From c78b6788ff8b2a90c7fc55e45971f8c674e65c55 Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 20:02:18 +0200 Subject: [PATCH 3/7] Update manifest.json --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index f919146..3948c40 100644 --- a/manifest.json +++ b/manifest.json @@ -41,8 +41,8 @@ "type": "password" }, { - "name": "first port" - "type": "firstport" + "name": "first port", + "type": "firstport", "ask": { "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)"" "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" @@ -50,8 +50,8 @@ "example": "20000" }, { - "name": "last port" - "type": "lastport" + "name": "last port", + "type": "lastport", "ask": { "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)"" "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 30000)" From 41ae2480170e1b7e7f9b9fab65bf3ea7d7f64c83 Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 20:03:44 +0200 Subject: [PATCH 4/7] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 3948c40..0b529cc 100644 --- a/manifest.json +++ b/manifest.json @@ -44,7 +44,7 @@ "name": "first port", "type": "firstport", "ask": { - "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)"" + "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)", "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" }, "example": "20000" @@ -53,7 +53,7 @@ "name": "last port", "type": "lastport", "ask": { - "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)"" + "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)", "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 30000)" }, "example": "30000" From 7dfacaeee9e09147c06fac3761e2dbd42f40dbc8 Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 20:11:25 +0200 Subject: [PATCH 5/7] Update manifest.json --- manifest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 0b529cc..e8369ad 100644 --- a/manifest.json +++ b/manifest.json @@ -41,8 +41,8 @@ "type": "password" }, { - "name": "first port", - "type": "firstport", + "name": "first-port", + "type": "number", "ask": { "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)", "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" @@ -50,8 +50,8 @@ "example": "20000" }, { - "name": "last port", - "type": "lastport", + "name": "last-port", + "type": "number", "ask": { "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)", "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 30000)" @@ -60,4 +60,4 @@ } ] } -} +} \ No newline at end of file From e7048ad02f5d281f319fcd40115590c1eca91fdc Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 20:17:07 +0200 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index e8369ad..986ff6f 100644 --- a/manifest.json +++ b/manifest.json @@ -41,16 +41,16 @@ "type": "password" }, { - "name": "first-port", + "name": "firstport", "type": "number", "ask": { "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)", - "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" + "de": "Bitte geben Sie den ERSTEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" }, "example": "20000" }, { - "name": "last-port", + "name": "lastport", "type": "number", "ask": { "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)", From ceb9d8638f79b8a10a8c9e858f4c0300dc330726 Mon Sep 17 00:00:00 2001 From: chris0688 <109092856+chris0688@users.noreply.github.com> Date: Mon, 11 Jul 2022 22:10:42 +0200 Subject: [PATCH 7/7] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 986ff6f..b6b4cce 100644 --- a/manifest.json +++ b/manifest.json @@ -45,7 +45,7 @@ "type": "number", "ask": { "en": "Enter the FIRST Port that should be used by Rport eg. port for tunnels (standard 20000)", - "de": "Bitte geben Sie den ERSTEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 20000)" + "de": "Bitte geben Sie den ERSTEN Port ein, welcher von Rport für z.B. die Tunnels genutzt wird (Standard 20000)" }, "example": "20000" }, @@ -54,7 +54,7 @@ "type": "number", "ask": { "en": "Enter the LAST Port that should be used by Rport eg. port for tunnels (standard 30000)", - "de": "Bitte geben Sie den LETZEN Port ein welcher von Rport für z.B. die Tunnels genutzt wird (Standart 30000)" + "de": "Bitte geben Sie den LETZEN Port ein, welcher von Rport für z.B. die Tunnels genutzt wird (Standard 30000)" }, "example": "30000" }