diff --git a/docker/frp/frpc.toml.example b/docker/frp/frpc.toml.example index 7a6c863..60e4325 100644 --- a/docker/frp/frpc.toml.example +++ b/docker/frp/frpc.toml.example @@ -1,6 +1,6 @@ # 复制为 frpc.toml 并把 token 换成真值(Bitwarden「frp home-tunnel」)。 # frpc.toml 含密钥,不入 git(部署由 scripts/setup-frp-remote.sh 自动完成)。 -serverAddr = "103.119.13.48" # pangolin1(frps) +serverAddr = "182.92.213.171" # ali 北京(frps) serverPort = 7000 auth.method = "token" auth.token = "" diff --git a/scripts/setup-frp-on-nas.sh b/scripts/setup-frp-on-nas.sh index eb58904..7ec8123 100755 --- a/scripts/setup-frp-on-nas.sh +++ b/scripts/setup-frp-on-nas.sh @@ -19,7 +19,7 @@ read -r TOKEN < "$TOKEN_FILE" echo "==> 1/6 写 frpc.toml + docker-compose.yml(sudo)" sudo mkdir -p "$FRP_DIR" sudo tee "$FRP_DIR/frpc.toml" > /dev/null < 2/6 安装 frpc 二进制 + systemd 常驻" sudo install -m 755 "$FRPC_BIN" /usr/local/bin/frpc sudo tee /etc/systemd/system/frpc.service > /dev/null <<'EOF' [Unit] -Description=frp client (home reverse tunnel to pangolin1) +Description=frp client (home reverse tunnel to ali frps) After=network-online.target Wants=network-online.target @@ -92,6 +92,12 @@ sudo systemctl enable frpc >/dev/null 2>&1 || true sudo systemctl restart frpc echo "==> 3/6 mihomo:hosts 覆盖 + fake-ip-filter + use-hosts(幂等)" +if [ ! -f "$CFG" ]; then + echo " !! mihomo 配置不存在($CFG)——NAS 上 mihomo 已不在运行,跳过 3/4/5 步。" + echo " !! 家内 DNS 覆盖需另行方案(群晖 DNS Server 套件),见 docs/remote-access-frp.html。" + SKIP_MIHOMO=1 +fi +if [ -z "${SKIP_MIHOMO:-}" ]; then cp "$CFG" "$CFG.bak.frp" echo " 备份: $CFG.bak.frp" python3 - "$CFG" <<'PY' @@ -185,6 +191,7 @@ echo " reload 已请求" echo "==> 5/6 验证家内解析(期望 192.168.3.200)" sleep 1 nslookup git.yanmeiai.com 127.0.0.1 2>&1 | tail -3 +fi # SKIP_MIHOMO echo "==> 6/6 验证 frpc 隧道" sleep 3