From 4cbf68bf2883954aafe0ce7d6cca9122817234d9 Mon Sep 17 00:00:00 2001 From: wangjia <809946525@qq.com> Date: Sun, 5 Jul 2026 23:41:32 +0800 Subject: [PATCH] =?UTF-8?q?chore(proxy):=20mihomo/dnsmasq=20=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E5=88=A0=E9=99=A4=EF=BC=88NAS=20=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BB=A3=E7=90=86=E5=87=BA=E7=BD=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2026-07-05 实机已 compose down 并删除 /volume1/docker/proxy（含 live uuid 的 config.yaml 一并清除）。README 登记 Web Station（brain 部署目标）。 Co-Authored-By: Claude Fable 5 --- README.md | 15 ++---- docker/proxy/dnsmasq/dnsmasq.conf | 12 ----- docker/proxy/docker-compose.yml | 11 ----- docker/proxy/mihomo/.env.example | 1 - docker/proxy/mihomo/config.yaml | 77 ------------------------------- 5 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 docker/proxy/dnsmasq/dnsmasq.conf delete mode 100644 docker/proxy/docker-compose.yml delete mode 100644 docker/proxy/mihomo/.env.example delete mode 100644 docker/proxy/mihomo/config.yaml diff --git a/README.md b/README.md index c02ee37..a240503 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,15 @@ Synology DS925+（192.168.3.200）的 Docker 服务配置管理。 | 服务 | 说明 | 地址 | |------|------|------| | Forgejo | 自托管 Git 服务 + CI/CD runner | http://git.51yanmei.com | -| mihomo | 透明代理网关（VLESS + Reality，上游 pangolin1 103.119.13.48） | 局域网网关 192.168.3.200 | -| dnsmasq | DHCP/DNS（预备，暂未启用） | — | +| Web Station | 静态站点托管（/volume1/web，brain 知识库部署目标） | http://192.168.3.200 | + +> mihomo 透明代理 + dnsmasq 已于 2026-07-05 下线删除（NAS 不再需要代理出网；历史配置见 git 历史 `docker/proxy/`）。注意：NAS 直连后 Forgejo CI 拉 docker hub 镜像可能受网络环境影响。 ## 目录 ``` docker/ -├── forgejo/ # Forgejo + act-runner -└── proxy/ # mihomo 透明代理 + dnsmasq +└── forgejo/ # Forgejo + act-runner ``` ## 部署 @@ -25,10 +25,6 @@ docker/ ```bash cp docker/forgejo/.env.example docker/forgejo/.env # 填入 GITEA_RUNNER_REGISTRATION_TOKEN - -cp docker/proxy/mihomo/.env.example docker/proxy/mihomo/.env -# 填入 VLESS_UUID（然后手动更新 config.yaml 中的 ） -# 2026-07-05 起 UUID = pangolin1 sing-box 443 入站的第一个用户（查看：ssh pangolin1 查 /etc/sing-box/config.json） ``` ### 启动服务 @@ -36,9 +32,6 @@ cp docker/proxy/mihomo/.env.example docker/proxy/mihomo/.env ```bash # Forgejo cd docker/forgejo && docker compose up -d - -# 透明代理 -cd docker/proxy && docker compose up -d ``` ## 连接 diff --git a/docker/proxy/dnsmasq/dnsmasq.conf b/docker/proxy/dnsmasq/dnsmasq.conf deleted file mode 100644 index dc5296a..0000000 --- a/docker/proxy/dnsmasq/dnsmasq.conf +++ /dev/null @@ -1,12 +0,0 @@ -# DHCP 服务 -dhcp-range=192.168.3.10,192.168.3.230,12h -dhcp-option=3,192.168.3.200 -dhcp-option=6,192.168.3.200 - -# DNS 上游指向 Mihomo（端口 1053） -server=127.0.0.1#1053 - -# 本地解析 -address=/nas.local/192.168.3.200 - -no-hosts diff --git a/docker/proxy/docker-compose.yml b/docker/proxy/docker-compose.yml deleted file mode 100644 index efde8f0..0000000 --- a/docker/proxy/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - mihomo: - image: metacubex/mihomo:latest - container_name: mihomo - restart: always - network_mode: host - privileged: true - volumes: - - /volume1/docker/proxy/mihomo:/root/.config/mihomo - environment: - - TZ=Asia/Shanghai diff --git a/docker/proxy/mihomo/.env.example b/docker/proxy/mihomo/.env.example deleted file mode 100644 index 57588c7..0000000 --- a/docker/proxy/mihomo/.env.example +++ /dev/null @@ -1 +0,0 @@ -VLESS_UUID= diff --git a/docker/proxy/mihomo/config.yaml b/docker/proxy/mihomo/config.yaml deleted file mode 100644 index 8da0fbe..0000000 --- a/docker/proxy/mihomo/config.yaml +++ /dev/null @@ -1,77 +0,0 @@ -mixed-port: 7890 -allow-lan: true -bind-address: '*' -mode: rule -log-level: info -ipv6: false - -external-controller: 0.0.0.0:9090 - -tun: - enable: true - stack: gvisor - mtu: 1500 - auto-route: true - auto-detect-interface: true - route-exclude-address: - - 103.119.13.48/32 - dns-hijack: - - any:53 - -dns: - enable: true - listen: 0.0.0.0:53 - enhanced-mode: fake-ip - fake-ip-persist: true - fake-ip-range: 198.18.0.0/15 - fake-ip-filter: - - '*.lan' - - '*.local' - - 'time.*.com' - - 'ntp.*.com' - - '+.pool.ntp.org' - # Tailscale 控制面/DERP 必须解析为真实 IP，否则 fake-ip 会导致 tailscaled - # 连不上控制服务器、tailscale up 卡住不打印登录 URL。详见 docs/public-access.md - - '+.tailscale.com' - - '+.tailscale.io' - - '+.tailscale-dns.com' - nameserver: - - 114.114.114.114 - - 223.5.5.5 - fallback: - - 8.8.8.8 - - 1.1.1.1 - fallback-filter: - geoip: true - geoip-code: CN - -proxies: - # 上游 = pangolin1（103.119.13.48，sing-box VLESS Reality :443，伪装 www.apple.com） - # 2026-07-05 由 ec2-sg 切换而来（ec2 已于 2026-07-04 退役，EIP 已释放） - - name: "pangolin1-us" - type: vless - server: 103.119.13.48 - port: 443 - uuid: - network: tcp - flow: xtls-rprx-vision - tls: true - udp: true - reality-opts: - public-key: TAPOvsNOTm9faWdqXz4vkpK_dVQJWjwWqS_PKK6ytBg - short-id: 69ddbef9f69d07d3 - servername: www.apple.com - client-fingerprint: chrome - -proxy-groups: - - name: "Proxy" - type: select - proxies: - - pangolin1-us - - DIRECT - -rules: - - GEOIP,private,DIRECT - - GEOSITE,cn,DIRECT - - GEOIP,CN,DIRECT - - MATCH,Proxy