From e37a17fb0343ff1841ad162d37a1af3f1319eeab Mon Sep 17 00:00:00 2001 From: "S. Davis" Date: Thu, 26 Dec 2024 21:09:47 -0500 Subject: [PATCH 1/5] Added OCA template and logo for RustDesk --- public/v4/apps/rustdesk.yml | 55 +++++++++++++++++++++++++++++++++++ public/v4/logos/rustdesk.png | Bin 0 -> 2650 bytes 2 files changed, 55 insertions(+) create mode 100644 public/v4/apps/rustdesk.yml create mode 100644 public/v4/logos/rustdesk.png diff --git a/public/v4/apps/rustdesk.yml b/public/v4/apps/rustdesk.yml new file mode 100644 index 000000000..8e49d982b --- /dev/null +++ b/public/v4/apps/rustdesk.yml @@ -0,0 +1,55 @@ +captainVersion: 4 +services: + $$cap_appname: + image: rustdesk/rustdesk-server:$$cap_rustdesk_version + ports: + - 21117:21117 + - 21119:21119 + volumes: + - $$cap_appname-data:/root + command: hbbr + restart: always + environment: + DATABASE_URL: $$cap_database_url + caproverExtra: + notExposeAsWebApp: 'true' + $$cap_appname-signal: + image: rustdesk/rustdesk-server:$$cap_rustdesk_version + depends_on: + - $$cap_appname + ports: + - 21115:21115 + - 21116:21116 + - 21118:21118 + volumes: + - $$cap_appname-signal-data:/root + command: hbbs -r $$cap_appname.$$cap_root_domain:21117 + restart: always + environment: + DATABASE_URL: $$cap_database_url + caproverExtra: + notExposeAsWebApp: 'true' +caproverOneClickApp: + variables: + - id: $$cap_rustdesk_version + label: RustDesk Version + defaultValue: '1.1.12' + description: Check out their Docker page for the valid tags https://hub.docker.com/r/rustdesk/rustdesk-server/tags + validRegex: /^([^\s^\/])+$/ + - id: $$cap_database_url + label: Database URL + defaultValue: 'sqlite://./db_v2.sqlite3' + description: As defined by the Docker Compose specification, changing this is not advised. + instructions: + start: >- + RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. + + This template installs the RustDesk signal and rendevous servers to provide E2EE connectivity between clients. + end: >- + Please wait for 2 minutes. RustDesk is deployed and available as $$cap_appname-rustdesk + + Be sure to enable WebSockets. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` + displayName: RustDesk Server + isOfficial: true + description: RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. + documentation: Taken from https://rustdesk.com/docs/en/ \ No newline at end of file diff --git a/public/v4/logos/rustdesk.png b/public/v4/logos/rustdesk.png new file mode 100644 index 0000000000000000000000000000000000000000..0dd918f8e4b0c25b34f56e783f85ac252cf4bc3d GIT binary patch literal 2650 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 IM6N<$f&;W6xBvhE literal 0 HcmV?d00001 From a14d0023af8e9bc8dd59a19b103fd4f8e3330411 Mon Sep 17 00:00:00 2001 From: Stephen Davis Date: Thu, 26 Dec 2024 21:41:10 -0500 Subject: [PATCH 2/5] Formatted spec --- public/v4/apps/rustdesk.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/v4/apps/rustdesk.yml b/public/v4/apps/rustdesk.yml index 8e49d982b..aa06ea4d8 100644 --- a/public/v4/apps/rustdesk.yml +++ b/public/v4/apps/rustdesk.yml @@ -10,9 +10,9 @@ services: command: hbbr restart: always environment: - DATABASE_URL: $$cap_database_url + DATABASE_URL: $$cap_database_url caproverExtra: - notExposeAsWebApp: 'true' + notExposeAsWebApp: 'true' $$cap_appname-signal: image: rustdesk/rustdesk-server:$$cap_rustdesk_version depends_on: @@ -42,14 +42,14 @@ caproverOneClickApp: description: As defined by the Docker Compose specification, changing this is not advised. instructions: start: >- - RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. + RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. - This template installs the RustDesk signal and rendevous servers to provide E2EE connectivity between clients. + This template installs the RustDesk signal and rendezvous servers to provide private E2EE connectivity between clients. end: >- - Please wait for 2 minutes. RustDesk is deployed and available as $$cap_appname-rustdesk + Please wait for 2 minutes. RustDesk is deployed and available as $$cap_appname-rustdesk - Be sure to enable WebSockets. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` + Be sure to enable WebSockets. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` displayName: RustDesk Server isOfficial: true description: RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. - documentation: Taken from https://rustdesk.com/docs/en/ \ No newline at end of file + documentation: Taken from https://rustdesk.com/docs/en/ From 3cfb35022e5c354ea2d55437fc0b4851f6bc481b Mon Sep 17 00:00:00 2001 From: Stephen Davis Date: Thu, 26 Dec 2024 21:47:06 -0500 Subject: [PATCH 3/5] Updated instructions with port details. --- public/v4/apps/rustdesk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/v4/apps/rustdesk.yml b/public/v4/apps/rustdesk.yml index aa06ea4d8..35f9daeb0 100644 --- a/public/v4/apps/rustdesk.yml +++ b/public/v4/apps/rustdesk.yml @@ -46,9 +46,9 @@ caproverOneClickApp: This template installs the RustDesk signal and rendezvous servers to provide private E2EE connectivity between clients. end: >- - Please wait for 2 minutes. RustDesk is deployed and available as $$cap_appname-rustdesk + Please wait for 2 minutes. RustDesk is deployed and will be available at $$cap_appname.$$cap_root_domain:21117 - Be sure to enable WebSockets. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` + Be sure to open ports `21115/tcp`-`21119/tcp`, and `21117/udp` in your firewall. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` displayName: RustDesk Server isOfficial: true description: RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. From f4e32b53910c88c4ded894465a5098aa00cc5ea6 Mon Sep 17 00:00:00 2001 From: Stephen Davis Date: Thu, 26 Dec 2024 21:48:00 -0500 Subject: [PATCH 4/5] Corrected UDP port number --- public/v4/apps/rustdesk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/v4/apps/rustdesk.yml b/public/v4/apps/rustdesk.yml index 35f9daeb0..10893d53c 100644 --- a/public/v4/apps/rustdesk.yml +++ b/public/v4/apps/rustdesk.yml @@ -48,7 +48,7 @@ caproverOneClickApp: end: >- Please wait for 2 minutes. RustDesk is deployed and will be available at $$cap_appname.$$cap_root_domain:21117 - Be sure to open ports `21115/tcp`-`21119/tcp`, and `21117/udp` in your firewall. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` + Be sure to open ports `21115/tcp`-`21119/tcp`, and `21116/udp` in your firewall. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` displayName: RustDesk Server isOfficial: true description: RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. From 721e5ec78b252d39e9b4cf58bdec3ae7b752e06a Mon Sep 17 00:00:00 2001 From: Stephen Davis Date: Thu, 26 Dec 2024 21:49:39 -0500 Subject: [PATCH 5/5] Updated location for public key information --- public/v4/apps/rustdesk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/v4/apps/rustdesk.yml b/public/v4/apps/rustdesk.yml index 10893d53c..adb649bd9 100644 --- a/public/v4/apps/rustdesk.yml +++ b/public/v4/apps/rustdesk.yml @@ -48,7 +48,7 @@ caproverOneClickApp: end: >- Please wait for 2 minutes. RustDesk is deployed and will be available at $$cap_appname.$$cap_root_domain:21117 - Be sure to open ports `21115/tcp`-`21119/tcp`, and `21116/udp` in your firewall. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id25519.pub` + Be sure to open ports `21115/tcp`-`21119/tcp`, and `21116/udp` in your firewall. You can find the public key in the App Logs, or via `/var/lib/docker/volumes/$$cap_appname-signal-data/_data/id_ed25519.pub` displayName: RustDesk Server isOfficial: true description: RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration.