feat: frp 安装支持配置密钥

This commit is contained in:
wanghe-fit2cloud 2024-08-02 16:13:27 +08:00
parent 5016b0bd77
commit 42f8c7f3b7
7 changed files with 87 additions and 78 deletions

View File

@ -1,36 +1,42 @@
additionalProperties: additionalProperties:
formFields: formFields:
- default: 127.0.0.1 - default: 127.0.0.1
envKey: SERVER_ADDRESS envKey: SERVER_ADDRESS
labelEn: Server Address labelEn: Server Address
labelZh: 服务端IP labelZh: 服务端IP
required: true required: true
type: text type: text
- default: 7000 - default: 7000
envKey: SERVER_PORT envKey: SERVER_PORT
labelEn: Server Port labelEn: Server Port
labelZh: 服务端端口 labelZh: 服务端端口
required: true required: true
type: number type: number
rule: paramPort rule: paramPort
- default: 7400 - default: 7400
envKey: PANEL_APP_PORT_HTTP envKey: PANEL_APP_PORT_HTTP
labelEn: Dashboard Port labelEn: Dashboard Port
labelZh: Dashboard 端口 labelZh: Dashboard 端口
required: true required: true
type: number type: number
rule: paramPort rule: paramPort
- default: admin - default: admin
envKey: USER_NAME envKey: USER_NAME
labelEn: Dashboard Username labelEn: Dashboard Username
labelZh: Dashboard 用户名 labelZh: Dashboard 用户名
required: true required: true
type: text type: text
- default: admin - default: admin
envKey: PASSWORD envKey: PASSWORD
labelEn: Dashboard Password labelEn: Dashboard Password
labelZh: Dashboard 密码 labelZh: Dashboard 密码
required: true required: true
random: true random: true
rule: paramComplexity rule: paramComplexity
type: password type: password
- default: 'token123456'
envKey: AUTH_TOKEN
labelEn: Auth Token
labelZh: 密钥
required: true
type: text

View File

@ -10,7 +10,6 @@ webServer.user = "admin"
webServer.password = "password123456" webServer.password = "password123456"
webServer.pprofEnable = false webServer.pprofEnable = false
# tls # tls
#transport.tls.certFile = "/etc/frp/ssl/client.crt" #transport.tls.certFile = "/etc/frp/ssl/client.crt"
#transport.tls.keyFile = "/etc/frp/ssl/client.key" #transport.tls.keyFile = "/etc/frp/ssl/client.key"

View File

@ -1,11 +1,11 @@
services: services:
frpc: frpc:
image: snowdreamtech/frpc:0.59.0
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
network_mode: host network_mode: host
volumes: volumes:
- ./data/frpc.toml:/etc/frp/frpc.toml - ./data/frpc.toml:/etc/frp/frpc.toml
- ./data/ssl:/etc/frp/ssl - ./data/ssl:/etc/frp/ssl
image: snowdreamtech/frpc:0.59.0 labels:
labels:
createdBy: "Apps" createdBy: "Apps"

View File

@ -4,7 +4,7 @@ source ./.env
sed -i "s/serverAddr = \".*\"/serverAddr = \"${SERVER_ADDRESS}\"/" ./data/frpc.toml sed -i "s/serverAddr = \".*\"/serverAddr = \"${SERVER_ADDRESS}\"/" ./data/frpc.toml
sed -i "s/serverPort = .*$/serverPort = ${SERVER_PORT}/" ./data/frpc.toml sed -i "s/serverPort = .*$/serverPort = ${SERVER_PORT}/" ./data/frpc.toml
sed -i "s/auth\.token = \".*\"/auth.token = \"${AUTH_TOKEN}\"/" ./data/frpc.toml
sed -i "s/webServer\.port = .*$/webServer.port = ${PANEL_APP_PORT_HTTP}/" ./data/frpc.toml sed -i "s/webServer\.port = .*$/webServer.port = ${PANEL_APP_PORT_HTTP}/" ./data/frpc.toml
sed -i "s/webServer\.user = \".*\"/webServer.user = \"${USER_NAME}\"/" ./data/frpc.toml sed -i "s/webServer\.user = \".*\"/webServer.user = \"${USER_NAME}\"/" ./data/frpc.toml
sed -i "s/webServer\.password = \".*\"/webServer.password = \"${PASSWORD}\"/" ./data/frpc.toml sed -i "s/webServer\.password = \".*\"/webServer.password = \"${PASSWORD}\"/" ./data/frpc.toml

View File

@ -1,30 +1,36 @@
additionalProperties: additionalProperties:
formFields: formFields:
- default: 7000 - default: 7000
envKey: PANEL_APP_PORT_SERVICE envKey: PANEL_APP_PORT_SERVICE
labelEn: Service Port labelEn: Service Port
labelZh: 服务端口 labelZh: 服务端口
required: true required: true
type: number type: number
rule: paramPort rule: paramPort
- default: 7500 - default: 7500
envKey: PANEL_APP_PORT_HTTP envKey: PANEL_APP_PORT_HTTP
labelEn: Dashboard Port labelEn: Dashboard Port
labelZh: Dashboard 端口 labelZh: Dashboard 端口
required: true required: true
type: number type: number
rule: paramPort rule: paramPort
- default: admin - default: admin
envKey: USER_NAME envKey: USER_NAME
labelEn: Username labelEn: Username
labelZh: 用户名 labelZh: 用户名
required: true required: true
type: text type: text
- default: admin - default: admin
envKey: PASSWORD envKey: PASSWORD
labelEn: Password labelEn: Password
labelZh: 密码 labelZh: 密码
required: true required: true
random: true random: true
rule: paramComplexity rule: paramComplexity
type: password type: password
- default: 'token123456'
envKey: AUTH_TOKEN
labelEn: Auth Token
labelZh: 密钥
required: true
type: text

View File

@ -1,11 +1,11 @@
services: services:
frps: frps:
image: snowdreamtech/frps:0.59.0
container_name: ${CONTAINER_NAME} container_name: ${CONTAINER_NAME}
restart: always restart: always
network_mode: host network_mode: host
volumes: volumes:
- ./data/frps.toml:/etc/frp/frps.toml - ./data/frps.toml:/etc/frp/frps.toml
- ./data/ssl:/etc/frp/ssl - ./data/ssl:/etc/frp/ssl
image: snowdreamtech/frps:0.59.0 labels:
labels:
createdBy: "Apps" createdBy: "Apps"

View File

@ -3,9 +3,7 @@
source ./.env source ./.env
sed -i "s/bindPort = .*$/bindPort = ${PANEL_APP_PORT_SERVICE}/" ./data/frps.toml sed -i "s/bindPort = .*$/bindPort = ${PANEL_APP_PORT_SERVICE}/" ./data/frps.toml
sed -i "s/auth\.token = \".*\"/auth.token = \"${AUTH_TOKEN}\"/" ./data/frps.toml
sed -i "s/webServer\.port = .*$/webServer.port = ${PANEL_APP_PORT_HTTP}/" ./data/frps.toml sed -i "s/webServer\.port = .*$/webServer.port = ${PANEL_APP_PORT_HTTP}/" ./data/frps.toml
sed -i "s/webServer\.user = \".*\"/webServer.user = \"${USER_NAME}\"/" ./data/frps.toml sed -i "s/webServer\.user = \".*\"/webServer.user = \"${USER_NAME}\"/" ./data/frps.toml
sed -i "s/webServer\.password = \".*\"/webServer.password = \"${PASSWORD}\"/" ./data/frps.toml sed -i "s/webServer\.password = \".*\"/webServer.password = \"${PASSWORD}\"/" ./data/frps.toml