From 7cea3b26e3327604162d573de3d3bf8e4ec511de Mon Sep 17 00:00:00 2001 From: okxlin Date: Tue, 12 Nov 2024 03:08:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0wireguard-easy=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wireguard-easy/14/.env.sample | 2 +- apps/wireguard-easy/14/data.yml | 2 +- apps/wireguard-easy/14/scripts/upgrade.sh | 4 ++-- apps/wireguard-easy/latest/.env.sample | 2 +- apps/wireguard-easy/latest/data.yml | 2 +- apps/wireguard-easy/latest/scripts/upgrade.sh | 4 ++-- apps/wireguard-easy/nightly/.env.sample | 2 +- apps/wireguard-easy/nightly/data.yml | 2 +- apps/wireguard-easy/nightly/scripts/upgrade.sh | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/wireguard-easy/14/.env.sample b/apps/wireguard-easy/14/.env.sample index 690e8c7b..8e582505 100644 --- a/apps/wireguard-easy/14/.env.sample +++ b/apps/wireguard-easy/14/.env.sample @@ -3,7 +3,7 @@ DATA_PATH="./data" HOST_ADDRESS="172.17.0.1" PANEL_APP_PORT_HTTP=40074 WG_ALLOWED_IPS="10.0.8.0/24" -WG_DEFAULT_ADDRESS="10.8.0.x" +WG_DEFAULT_ADDRESS="10.0.8.x" WG_DEFAULT_DNS="119.29.29.29,1.1.1.1" WG_MTU=1420 WG_PERSISTENT_KEEPALIVE=25 diff --git a/apps/wireguard-easy/14/data.yml b/apps/wireguard-easy/14/data.yml index 1bc83373..56ba0cb7 100644 --- a/apps/wireguard-easy/14/data.yml +++ b/apps/wireguard-easy/14/data.yml @@ -37,7 +37,7 @@ additionalProperties: labelZh: 本机地址(必改项) required: true type: text - - default: "10.8.0.x" + - default: "10.0.8.x" edit: true envKey: WG_DEFAULT_ADDRESS labelEn: Default Wireguard Segment diff --git a/apps/wireguard-easy/14/scripts/upgrade.sh b/apps/wireguard-easy/14/scripts/upgrade.sh index b63a25de..68918122 100644 --- a/apps/wireguard-easy/14/scripts/upgrade.sh +++ b/apps/wireguard-easy/14/scripts/upgrade.sh @@ -19,8 +19,8 @@ if [[ -f ./.env ]]; then # 检查并添加 WG_DEFAULT_ADDRESS 参数 if ! grep -q 'WG_DEFAULT_ADDRESS' ./.env; then - echo 'WG_DEFAULT_ADDRESS="10.8.0.x"' >> ./.env - echo "已添加 WG_DEFAULT_ADDRESS=10.8.0.x" + echo 'WG_DEFAULT_ADDRESS="10.0.8.x"' >> ./.env + echo "已添加 WG_DEFAULT_ADDRESS=10.0.8.x" else echo "WG_DEFAULT_ADDRESS 参数已存在" fi diff --git a/apps/wireguard-easy/latest/.env.sample b/apps/wireguard-easy/latest/.env.sample index 690e8c7b..8e582505 100644 --- a/apps/wireguard-easy/latest/.env.sample +++ b/apps/wireguard-easy/latest/.env.sample @@ -3,7 +3,7 @@ DATA_PATH="./data" HOST_ADDRESS="172.17.0.1" PANEL_APP_PORT_HTTP=40074 WG_ALLOWED_IPS="10.0.8.0/24" -WG_DEFAULT_ADDRESS="10.8.0.x" +WG_DEFAULT_ADDRESS="10.0.8.x" WG_DEFAULT_DNS="119.29.29.29,1.1.1.1" WG_MTU=1420 WG_PERSISTENT_KEEPALIVE=25 diff --git a/apps/wireguard-easy/latest/data.yml b/apps/wireguard-easy/latest/data.yml index 1bc83373..56ba0cb7 100644 --- a/apps/wireguard-easy/latest/data.yml +++ b/apps/wireguard-easy/latest/data.yml @@ -37,7 +37,7 @@ additionalProperties: labelZh: 本机地址(必改项) required: true type: text - - default: "10.8.0.x" + - default: "10.0.8.x" edit: true envKey: WG_DEFAULT_ADDRESS labelEn: Default Wireguard Segment diff --git a/apps/wireguard-easy/latest/scripts/upgrade.sh b/apps/wireguard-easy/latest/scripts/upgrade.sh index b63a25de..68918122 100644 --- a/apps/wireguard-easy/latest/scripts/upgrade.sh +++ b/apps/wireguard-easy/latest/scripts/upgrade.sh @@ -19,8 +19,8 @@ if [[ -f ./.env ]]; then # 检查并添加 WG_DEFAULT_ADDRESS 参数 if ! grep -q 'WG_DEFAULT_ADDRESS' ./.env; then - echo 'WG_DEFAULT_ADDRESS="10.8.0.x"' >> ./.env - echo "已添加 WG_DEFAULT_ADDRESS=10.8.0.x" + echo 'WG_DEFAULT_ADDRESS="10.0.8.x"' >> ./.env + echo "已添加 WG_DEFAULT_ADDRESS=10.0.8.x" else echo "WG_DEFAULT_ADDRESS 参数已存在" fi diff --git a/apps/wireguard-easy/nightly/.env.sample b/apps/wireguard-easy/nightly/.env.sample index 690e8c7b..8e582505 100644 --- a/apps/wireguard-easy/nightly/.env.sample +++ b/apps/wireguard-easy/nightly/.env.sample @@ -3,7 +3,7 @@ DATA_PATH="./data" HOST_ADDRESS="172.17.0.1" PANEL_APP_PORT_HTTP=40074 WG_ALLOWED_IPS="10.0.8.0/24" -WG_DEFAULT_ADDRESS="10.8.0.x" +WG_DEFAULT_ADDRESS="10.0.8.x" WG_DEFAULT_DNS="119.29.29.29,1.1.1.1" WG_MTU=1420 WG_PERSISTENT_KEEPALIVE=25 diff --git a/apps/wireguard-easy/nightly/data.yml b/apps/wireguard-easy/nightly/data.yml index 1bc83373..56ba0cb7 100644 --- a/apps/wireguard-easy/nightly/data.yml +++ b/apps/wireguard-easy/nightly/data.yml @@ -37,7 +37,7 @@ additionalProperties: labelZh: 本机地址(必改项) required: true type: text - - default: "10.8.0.x" + - default: "10.0.8.x" edit: true envKey: WG_DEFAULT_ADDRESS labelEn: Default Wireguard Segment diff --git a/apps/wireguard-easy/nightly/scripts/upgrade.sh b/apps/wireguard-easy/nightly/scripts/upgrade.sh index b63a25de..68918122 100644 --- a/apps/wireguard-easy/nightly/scripts/upgrade.sh +++ b/apps/wireguard-easy/nightly/scripts/upgrade.sh @@ -19,8 +19,8 @@ if [[ -f ./.env ]]; then # 检查并添加 WG_DEFAULT_ADDRESS 参数 if ! grep -q 'WG_DEFAULT_ADDRESS' ./.env; then - echo 'WG_DEFAULT_ADDRESS="10.8.0.x"' >> ./.env - echo "已添加 WG_DEFAULT_ADDRESS=10.8.0.x" + echo 'WG_DEFAULT_ADDRESS="10.0.8.x"' >> ./.env + echo "已添加 WG_DEFAULT_ADDRESS=10.0.8.x" else echo "WG_DEFAULT_ADDRESS 参数已存在" fi