From e47d274f59ec4067d5cd9bdbc26ff90bbbee198b Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Thu, 19 Oct 2023 15:19:39 +0800
Subject: [PATCH] feat: frpc script => scripts

---
 apps/frpc/0.52.1/data.yml                    | 2 ++
 apps/frpc/0.52.1/{script => scripts}/init.sh | 1 -
 apps/frps/0.52.1/data.yml                    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename apps/frpc/0.52.1/{script => scripts}/init.sh (83%)

diff --git a/apps/frpc/0.52.1/data.yml b/apps/frpc/0.52.1/data.yml
index 2c9a57aa..2a164c2d 100644
--- a/apps/frpc/0.52.1/data.yml
+++ b/apps/frpc/0.52.1/data.yml
@@ -12,12 +12,14 @@ additionalProperties:
           labelZh: 服务端端口
           required: true
           type: number
+          rule: paramPort
         - default: 7400
           envKey: PANEL_APP_PORT_HTTP
           labelEn: Dashboard Port
           labelZh: Dashboard 端口
           required: true
           type: number
+          rule: paramPort
         - default: admin
           envKey: USER_NAME
           labelEn: Dashboard Username
diff --git a/apps/frpc/0.52.1/script/init.sh b/apps/frpc/0.52.1/scripts/init.sh
similarity index 83%
rename from apps/frpc/0.52.1/script/init.sh
rename to apps/frpc/0.52.1/scripts/init.sh
index 3f882019..659752e4 100644
--- a/apps/frpc/0.52.1/script/init.sh
+++ b/apps/frpc/0.52.1/scripts/init.sh
@@ -4,7 +4,6 @@ source ./.env
 
 sed -i "s/serverAddr = \".*\"/serverAddr = \"${SERVER_ADDRESS}\"/" ./data/frpc.toml
 sed -i "s/serverPort = .*$/serverPort = ${SERVER_PORT}/" ./data/frpc.toml
-sed -i "s/webServer\.addr = \".*\"/webServer.addr = \"${SERVER_ADDRESS}\"/" ./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\.password = \".*\"/webServer.password = \"${PASSWORD}\"/" ./data/frpc.toml
diff --git a/apps/frps/0.52.1/data.yml b/apps/frps/0.52.1/data.yml
index 92049d06..e71e29ff 100644
--- a/apps/frps/0.52.1/data.yml
+++ b/apps/frps/0.52.1/data.yml
@@ -6,12 +6,14 @@ additionalProperties:
           labelZh: 服务端口
           required: true
           type: number
+          rule: paramPort
         - default: 7500
           envKey: PANEL_APP_PORT_HTTP
           labelEn: Dashboard Port
           labelZh: Dashboard 端口
           required: true
           type: number
+          rule: paramPort
         - default: admin
           envKey: USER_NAME
           labelEn: Username