From 19aa05ac0d2095a378fc2654e7d166834aff2aaa Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:40:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=AD=97=E6=AE=B5=20(#209)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nginx-proxy-manager/github-pr-3027/data.yml   |  4 +--
 .../github-pr-3027/docker-compose.yml         |  4 +--
 rustdesk/latest/docker-compose.yml            | 30 +++++++------------
 synapse/1.86.0/data.yml                       | 11 -------
 synapse/1.86.0/docker-compose.yml             | 30 -------------------
 5 files changed, 14 insertions(+), 65 deletions(-)
 delete mode 100644 synapse/1.86.0/data.yml
 delete mode 100644 synapse/1.86.0/docker-compose.yml

diff --git a/nginx-proxy-manager/github-pr-3027/data.yml b/nginx-proxy-manager/github-pr-3027/data.yml
index 586774645..959fdcc95 100644
--- a/nginx-proxy-manager/github-pr-3027/data.yml
+++ b/nginx-proxy-manager/github-pr-3027/data.yml
@@ -2,7 +2,7 @@ additionalProperties:
     formFields:
         - default: 30080
           edit: true
-          envKey: PANEL_APP_PORT_HTTP
+          envKey: PANEL_APP_PORT_HTTP1
           labelEn: HTTP Port
           labelZh: HTTP端口
           required: true
@@ -10,7 +10,7 @@ additionalProperties:
           type: number
         - default: 30081
           edit: true
-          envKey: PANEL_APP_PORT_HTTP1
+          envKey: PANEL_APP_PORT_HTTP
           labelEn: Console Port
           labelZh: 控制台端口
           required: true
diff --git a/nginx-proxy-manager/github-pr-3027/docker-compose.yml b/nginx-proxy-manager/github-pr-3027/docker-compose.yml
index 7528ee1df..2d19388e7 100644
--- a/nginx-proxy-manager/github-pr-3027/docker-compose.yml
+++ b/nginx-proxy-manager/github-pr-3027/docker-compose.yml
@@ -6,8 +6,8 @@ services:
     networks:
       - 1panel-network
     ports:
-      - "${PANEL_APP_PORT_HTTP}:80"
-      - "${PANEL_APP_PORT_HTTP1}:81"
+      - "${PANEL_APP_PORT_HTTP1}:80"
+      - "${PANEL_APP_PORT_HTTP}:81"
       - "${PANEL_APP_PORT_HTTP2}:443"
     volumes:
       - "${DATA_PATH}:/data"
diff --git a/rustdesk/latest/docker-compose.yml b/rustdesk/latest/docker-compose.yml
index 0d912f329..dcaed90a9 100644
--- a/rustdesk/latest/docker-compose.yml
+++ b/rustdesk/latest/docker-compose.yml
@@ -4,44 +4,34 @@ services:
     container_name: ${CONTAINER_NAME}_hbbs
     restart: always
     ports:
-      - "${NAT_TEST_PORT}:21115" #NAT类型测试
-      - "${HBBS_PORT}:21116" # 自定义 hbbs 映射端口
-      - "${HBBS_PORT}:21116/udp" #自定义 hbbs 映射端口
-      - "${WEB_CLIENT_PORT1}:21118" #网页客户端支持端口
-    command: hbbs -r ${HOST_ADDRESS}:${HBBS_PORT} -k _ # 填入个人域名或 IP +  暴露端口
+      - "${NAT_TEST_PORT}:21115"
+      - "${HBBS_PORT}:21116"
+      - "${HBBS_PORT}:21116/udp"
+      - "${WEB_CLIENT_PORT1}:21118"
+    command: hbbs -r ${HOST_ADDRESS}:${HBBS_PORT} -k _
     volumes:
       - "./data/hbbs:/root" # 自定义挂载目录
     networks:
       - 1panel-network
     depends_on:
       - hbbr
-#    deploy:
-#      resources:
-#        limits:
-#          memory: 64M
     image: rustdesk/rustdesk-server:latest
-#    image: rustdesk/rustdesk-server:latest-arm64v8 # 镜像选用 arm64 版
-    labels:  
+    labels:
       createdBy: "Apps"
 
   hbbr:
     container_name: ${CONTAINER_NAME}_hbbr
     restart: always
     ports:
-      - "${HBBR_PORT}:21117" # 自定义 hbbr 映射端口
-      - "${WEB_CLIENT_PORT2}:21119" #网页客户端支持端口
+      - "${HBBR_PORT}:21117"
+      - "${WEB_CLIENT_PORT2}:21119"
     command: hbbr -k _
     volumes:
-      - "./data/hbbr:/root" # 自定义挂载目录
+      - "./data/hbbr:/root"
     networks:
       - 1panel-network
-#    deploy:
-#      resources:
-#        limits:
-#          memory: 64M
     image: rustdesk/rustdesk-server:latest
-#    image: rustdesk/rustdesk-server:latest-arm64v8 # 镜像选用 arm64 版
-    labels:  
+    labels:
       createdBy: "Apps"
 
 networks:  
diff --git a/synapse/1.86.0/data.yml b/synapse/1.86.0/data.yml
deleted file mode 100644
index 70a3eec15..000000000
--- a/synapse/1.86.0/data.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 40026
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-
diff --git a/synapse/1.86.0/docker-compose.yml b/synapse/1.86.0/docker-compose.yml
deleted file mode 100644
index 5f9b71ac3..000000000
--- a/synapse/1.86.0/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: "3"
-services:
-  synapse:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    networks:
-      - 1panel-network
-    volumes:
-      - synapse-data:/data
-    ports:
-      - "${PANEL_APP_PORT_HTTP}:8008"
-    environment:
-      - TZ=Asia/Shanghai
-      - UID=1000
-      - GID=1000
-    image: matrixdotorg/synapse:v1.86.0
-    logging:
-      options:
-        max-size: "10m"
-    command: run -m synapse.app.homeserver --config-path=/data/homeserver.yaml
-    labels:  
-      createdBy: "Apps"
-
-volumes:
-  synapse-data:
-    external: true
-
-networks:  
-  1panel-network:  
-    external: true