From 9f0b9b21a812ab87b4d6f3bb1943aeea869eb223 Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Fri, 22 Mar 2024 16:29:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0frpc=20tls=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/frpc/0.56.0/data.yml           | 9 ++++++++-
 apps/frpc/0.56.0/data/frpc.toml     | 5 +++++
 apps/frpc/0.56.0/docker-compose.yml | 1 +
 apps/frpc/latest/data.yml           | 9 ++++++++-
 apps/frpc/latest/data/frpc.toml     | 5 +++++
 apps/frpc/latest/docker-compose.yml | 1 +
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/apps/frpc/0.56.0/data.yml b/apps/frpc/0.56.0/data.yml
index 04749921..e28d5bd3 100644
--- a/apps/frpc/0.56.0/data.yml
+++ b/apps/frpc/0.56.0/data.yml
@@ -13,4 +13,11 @@ additionalProperties:
           labelEn: Port (determined by the configuration file)
           labelZh: 端口 (由配置文件决定)
           required: true
-          type: number
\ No newline at end of file
+          type: number
+        - default: ./data/ssl
+          edit: true
+          envKey: SSL_FOLDER_PATH
+          labelEn: Certificate folder path (corresponding to "/etc/frp/ssl" in container)
+          labelZh: 证书文件夹路径 (对应容器内 "/etc/frp/ssl")
+          required: true
+          type: text
diff --git a/apps/frpc/0.56.0/data/frpc.toml b/apps/frpc/0.56.0/data/frpc.toml
index 06f4771d..9e64a124 100644
--- a/apps/frpc/0.56.0/data/frpc.toml
+++ b/apps/frpc/0.56.0/data/frpc.toml
@@ -22,6 +22,11 @@ transport.tls.enable = false
 # transport.tls.trustedCaFile = "ca.crt"
 # transport.tls.serverName = "example.com"
 
+# tls
+#transport.tls.certFile = "/etc/frp/ssl/client.crt"
+#transport.tls.keyFile = "/etc/frp/ssl/client.key"
+#transport.tls.trustedCaFile = "/etc/frp/ssl/ca.crt"
+
 [[proxies]]
 name = "rdp_tcp"
 type = "tcp"
diff --git a/apps/frpc/0.56.0/docker-compose.yml b/apps/frpc/0.56.0/docker-compose.yml
index 0380d9e6..b24b671d 100644
--- a/apps/frpc/0.56.0/docker-compose.yml
+++ b/apps/frpc/0.56.0/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     volumes:
         #- "${CONFIG_FILE_PATH}:/etc/frp/frpc.ini" #截止5.1.3版本使用ini
         - "${CONFIG_FILE_PATH}:/etc/frp/frpc.toml"
+        - "${SSL_FOLDER_PATH}:/etc/frp/ssl"
     image: "snowdreamtech/frpc:0.56.0"
     labels:  
       createdBy: "Apps"
diff --git a/apps/frpc/latest/data.yml b/apps/frpc/latest/data.yml
index 04749921..e28d5bd3 100644
--- a/apps/frpc/latest/data.yml
+++ b/apps/frpc/latest/data.yml
@@ -13,4 +13,11 @@ additionalProperties:
           labelEn: Port (determined by the configuration file)
           labelZh: 端口 (由配置文件决定)
           required: true
-          type: number
\ No newline at end of file
+          type: number
+        - default: ./data/ssl
+          edit: true
+          envKey: SSL_FOLDER_PATH
+          labelEn: Certificate folder path (corresponding to "/etc/frp/ssl" in container)
+          labelZh: 证书文件夹路径 (对应容器内 "/etc/frp/ssl")
+          required: true
+          type: text
diff --git a/apps/frpc/latest/data/frpc.toml b/apps/frpc/latest/data/frpc.toml
index 06f4771d..9e64a124 100644
--- a/apps/frpc/latest/data/frpc.toml
+++ b/apps/frpc/latest/data/frpc.toml
@@ -22,6 +22,11 @@ transport.tls.enable = false
 # transport.tls.trustedCaFile = "ca.crt"
 # transport.tls.serverName = "example.com"
 
+# tls
+#transport.tls.certFile = "/etc/frp/ssl/client.crt"
+#transport.tls.keyFile = "/etc/frp/ssl/client.key"
+#transport.tls.trustedCaFile = "/etc/frp/ssl/ca.crt"
+
 [[proxies]]
 name = "rdp_tcp"
 type = "tcp"
diff --git a/apps/frpc/latest/docker-compose.yml b/apps/frpc/latest/docker-compose.yml
index c1026439..d3466e24 100644
--- a/apps/frpc/latest/docker-compose.yml
+++ b/apps/frpc/latest/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     volumes:
         #- "${CONFIG_FILE_PATH}:/etc/frp/frpc.ini" #截止5.1.3版本使用ini
         - "${CONFIG_FILE_PATH}:/etc/frp/frpc.toml"
+        - "${SSL_FOLDER_PATH}:/etc/frp/ssl"
     image: "snowdreamtech/frpc:latest"
     labels:  
       createdBy: "Apps"