From 19be796c52bd4a0670802939df60d2845c254f43 Mon Sep 17 00:00:00 2001 From: okxlin Date: Wed, 10 Jan 2024 14:49:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:frps=E6=B7=BB=E5=8A=A0=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/frps/0.53.2/.env.sample | 3 ++- apps/frps/0.53.2/data.yml | 39 +++++++++++++++++------------ apps/frps/0.53.2/data/frps.toml | 6 ++--- apps/frps/0.53.2/docker-compose.yml | 1 + apps/frps/latest/.env.sample | 3 ++- apps/frps/latest/data.yml | 39 +++++++++++++++++------------ apps/frps/latest/data/frps.toml | 6 ++--- apps/frps/latest/docker-compose.yml | 1 + 8 files changed, 58 insertions(+), 40 deletions(-) diff --git a/apps/frps/0.53.2/.env.sample b/apps/frps/0.53.2/.env.sample index 5d3caf0e6..fa2ac7869 100644 --- a/apps/frps/0.53.2/.env.sample +++ b/apps/frps/0.53.2/.env.sample @@ -1 +1,2 @@ -CONTAINER_NAME="frps" \ No newline at end of file +CONTAINER_NAME="frps" +SSL_FOLDER_PATH="./data/ssl" \ No newline at end of file diff --git a/apps/frps/0.53.2/data.yml b/apps/frps/0.53.2/data.yml index 07013e243..de8ae3d9e 100644 --- a/apps/frps/0.53.2/data.yml +++ b/apps/frps/0.53.2/data.yml @@ -1,16 +1,23 @@ -additionalProperties: - formFields: - - default: ./data/frps.toml - edit: true - envKey: CONFIG_FILE_PATH - labelEn: Configuration file path - labelZh: 配置文件路径 - required: true - type: text - - default: 7000 - disabled: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port (determined by the configuration file) - labelZh: 端口 (由配置文件决定) - required: true - type: number \ No newline at end of file +additionalProperties: + formFields: + - default: ./data/frps.toml + edit: true + envKey: CONFIG_FILE_PATH + labelEn: Configuration file path + labelZh: 配置文件路径 + required: true + type: text + - default: 7000 + disabled: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port (determined by the configuration file) + labelZh: 端口 (由配置文件决定) + required: true + 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 \ No newline at end of file diff --git a/apps/frps/0.53.2/data/frps.toml b/apps/frps/0.53.2/data/frps.toml index a732825bb..6a2f2cc25 100644 --- a/apps/frps/0.53.2/data/frps.toml +++ b/apps/frps/0.53.2/data/frps.toml @@ -20,9 +20,9 @@ kcpBindPort = 7000 # tls tls.force = false -#transport.tls.certFile = "/etc/frp/server.crt" -#transport.tls.keyFile = "/etc/frp/server.key" -#transport.tls.trustedCaFile = "/etc/frp/ca.crt" +#transport.tls.certFile = "/etc/frp/ssl/server.crt" +#transport.tls.keyFile = "/etc/frp/ssl/server.key" +#transport.tls.trustedCaFile = "/etc/frp/ssl/ca.crt" # dashboard webServer.addr = "0.0.0.0" diff --git a/apps/frps/0.53.2/docker-compose.yml b/apps/frps/0.53.2/docker-compose.yml index 1bd60fcf3..40e005865 100644 --- a/apps/frps/0.53.2/docker-compose.yml +++ b/apps/frps/0.53.2/docker-compose.yml @@ -7,6 +7,7 @@ services: volumes: #- "${CONFIG_FILE_PATH}:/etc/frp/frps.ini" #截止5.1.3版本使用ini - "${CONFIG_FILE_PATH}:/etc/frp/frps.toml" + - "${SSL_FOLDER_PATH}:/etc/frp/ssl" image: "snowdreamtech/frps:0.53.2" labels: createdBy: "Apps" diff --git a/apps/frps/latest/.env.sample b/apps/frps/latest/.env.sample index 5d3caf0e6..fa2ac7869 100644 --- a/apps/frps/latest/.env.sample +++ b/apps/frps/latest/.env.sample @@ -1 +1,2 @@ -CONTAINER_NAME="frps" \ No newline at end of file +CONTAINER_NAME="frps" +SSL_FOLDER_PATH="./data/ssl" \ No newline at end of file diff --git a/apps/frps/latest/data.yml b/apps/frps/latest/data.yml index 07013e243..de8ae3d9e 100644 --- a/apps/frps/latest/data.yml +++ b/apps/frps/latest/data.yml @@ -1,16 +1,23 @@ -additionalProperties: - formFields: - - default: ./data/frps.toml - edit: true - envKey: CONFIG_FILE_PATH - labelEn: Configuration file path - labelZh: 配置文件路径 - required: true - type: text - - default: 7000 - disabled: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port (determined by the configuration file) - labelZh: 端口 (由配置文件决定) - required: true - type: number \ No newline at end of file +additionalProperties: + formFields: + - default: ./data/frps.toml + edit: true + envKey: CONFIG_FILE_PATH + labelEn: Configuration file path + labelZh: 配置文件路径 + required: true + type: text + - default: 7000 + disabled: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port (determined by the configuration file) + labelZh: 端口 (由配置文件决定) + required: true + 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 \ No newline at end of file diff --git a/apps/frps/latest/data/frps.toml b/apps/frps/latest/data/frps.toml index a732825bb..6a2f2cc25 100644 --- a/apps/frps/latest/data/frps.toml +++ b/apps/frps/latest/data/frps.toml @@ -20,9 +20,9 @@ kcpBindPort = 7000 # tls tls.force = false -#transport.tls.certFile = "/etc/frp/server.crt" -#transport.tls.keyFile = "/etc/frp/server.key" -#transport.tls.trustedCaFile = "/etc/frp/ca.crt" +#transport.tls.certFile = "/etc/frp/ssl/server.crt" +#transport.tls.keyFile = "/etc/frp/ssl/server.key" +#transport.tls.trustedCaFile = "/etc/frp/ssl/ca.crt" # dashboard webServer.addr = "0.0.0.0" diff --git a/apps/frps/latest/docker-compose.yml b/apps/frps/latest/docker-compose.yml index 5901a03da..5321ae83b 100644 --- a/apps/frps/latest/docker-compose.yml +++ b/apps/frps/latest/docker-compose.yml @@ -7,6 +7,7 @@ services: volumes: #- "${CONFIG_FILE_PATH}:/etc/frp/frps.ini" #截止5.1.3版本使用ini - "${CONFIG_FILE_PATH}:/etc/frp/frps.toml" + - "${SSL_FOLDER_PATH}:/etc/frp/ssl" image: "snowdreamtech/frps:latest" labels: createdBy: "Apps"