From f3775ae7eee763027703e18211ebc78f90510e5d Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Fri, 9 Jun 2023 03:37:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0rustdesk=E5=88=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rustdesk/{data.yml.bak => data.yml} | 2 +-
 apps/rustdesk/latest/.env.sample         | 4 ++++
 apps/rustdesk/latest/docker-compose.yml  | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename apps/rustdesk/{data.yml.bak => data.yml} (94%)

diff --git a/apps/rustdesk/data.yml.bak b/apps/rustdesk/data.yml
similarity index 94%
rename from apps/rustdesk/data.yml.bak
rename to apps/rustdesk/data.yml
index 9652c223..0a4702f2 100644
--- a/apps/rustdesk/data.yml.bak
+++ b/apps/rustdesk/data.yml
@@ -13,7 +13,7 @@ additionalProperties:
     shortDescEn: RustDesk is an open source remote desktop software
     type: tool
     crossVersionUpdate: false
-    limit: 1
+    limit: 0
     recommend: 0
     website: https://rustdesk.com/zh/
     github: https://github.com/rustdesk/rustdesk
diff --git a/apps/rustdesk/latest/.env.sample b/apps/rustdesk/latest/.env.sample
index 92e24833..b34e1183 100644
--- a/apps/rustdesk/latest/.env.sample
+++ b/apps/rustdesk/latest/.env.sample
@@ -1,3 +1,7 @@
 CONTAINER_NAME=rustdesk
+NAT_TEST_PORT=21115
 HBBS_PORT=21116
+HBBR_PORT=21117
+WEB_CLIENT_PORT1=21118
+WEB_CLIENT_PORT2=21119
 HOST_ADDRESS=172.17.0.1
diff --git a/apps/rustdesk/latest/docker-compose.yml b/apps/rustdesk/latest/docker-compose.yml
index 9566dd77..0d912f32 100644
--- a/apps/rustdesk/latest/docker-compose.yml
+++ b/apps/rustdesk/latest/docker-compose.yml
@@ -8,7 +8,6 @@ services:
       - "${HBBS_PORT}:21116" # 自定义 hbbs 映射端口
       - "${HBBS_PORT}:21116/udp" #自定义 hbbs 映射端口
       - "${WEB_CLIENT_PORT1}:21118" #网页客户端支持端口
-      - "${WEB_CLIENT_PORT2}:21119" #网页客户端支持端口
     command: hbbs -r ${HOST_ADDRESS}:${HBBS_PORT} -k _ # 填入个人域名或 IP +  暴露端口
     volumes:
       - "./data/hbbs:/root" # 自定义挂载目录
@@ -29,7 +28,8 @@ services:
     container_name: ${CONTAINER_NAME}_hbbr
     restart: always
     ports:
-      - ${HBBR_PORT}:21117 # 自定义 hbbr 映射端口
+      - "${HBBR_PORT}:21117" # 自定义 hbbr 映射端口
+      - "${WEB_CLIENT_PORT2}:21119" #网页客户端支持端口
     command: hbbr -k _
     volumes:
       - "./data/hbbr:/root" # 自定义挂载目录