From df95b6690b6b482d4f485e5a0c4d63c3573e7f65 Mon Sep 17 00:00:00 2001 From: mm644706215 Date: Tue, 30 Sep 2025 23:49:26 +0800 Subject: [PATCH] reomve --- server/Dockerfile.caddy-l4 | 36 --------------- server/caddy/Caddyfile | 54 ---------------------- server/caddy/env/caddy.env | 10 ---- server/caddy/env/caddy.env.example | 14 ------ server/caddy/l4.json | 73 ------------------------------ server/caddy/site/index.html | 3 -- server/docker-compose-l4.yml | 49 -------------------- server/docker-compose.yml | 32 ------------- server/v2ray/config.json | 52 --------------------- 9 files changed, 323 deletions(-) delete mode 100644 server/Dockerfile.caddy-l4 delete mode 100644 server/caddy/Caddyfile delete mode 100644 server/caddy/env/caddy.env delete mode 100644 server/caddy/env/caddy.env.example delete mode 100644 server/caddy/l4.json delete mode 100644 server/caddy/site/index.html delete mode 100644 server/docker-compose-l4.yml delete mode 100644 server/docker-compose.yml delete mode 100644 server/v2ray/config.json diff --git a/server/Dockerfile.caddy-l4 b/server/Dockerfile.caddy-l4 deleted file mode 100644 index 2e2e6bf..0000000 --- a/server/Dockerfile.caddy-l4 +++ /dev/null @@ -1,36 +0,0 @@ -# ========= Stage 1: （可选）你的前端静态资源构建 ========= -FROM node:lts-alpine AS ui-builder -WORKDIR /src -COPY headscale-ui/package*.json ./ -RUN npm ci -COPY headscale-ui/ . -RUN npm run build - -# ========= Stage 2: 用 Go 1.25 (Alpine) 构建 Caddy + 插件 ========= -FROM golang:1.25.0-alpine3.22 AS caddy-builder - -RUN echo "https://mirrors.aliyun.com/alpine/v3.22/main" > /etc/apk/repositories && \ - echo "https://mirrors.aliyun.com/alpine/v3.22/community" >> /etc/apk/repositories && \ - apk update && \ - apk add --no-cache git build-base ca-certificates - -ENV GOPROXY=https://goproxy.cn,direct -ENV GOTOOLCHAIN=local - -RUN go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest - -# 用 xcaddy 构建 (保持与用户提供版本一致/可调整) -RUN /go/bin/xcaddy build v2.10.1 \ - --output /usr/local/bin/caddy \ - --with github.com/caddy-dns/alidns@v1.0.26 \ - --with github.com/caddy-dns/cloudflare@v0.2.1 \ - --with github.com/mholt/caddy-l4 - -# ========= Stage 3: 运行时镜像（Alpine） ========= -FROM caddy:2.10.0-alpine -COPY --from=caddy-builder /usr/local/bin/caddy /usr/bin/caddy -COPY --from=ui-builder /src/build /usr/src/www - -RUN apk update && \ - apk add --no-cache bind-tools netcat-openbsd jq curl && \ - mkdir -p /data/log/headscale diff --git a/server/caddy/Caddyfile b/server/caddy/Caddyfile deleted file mode 100644 index 2ddfa97..0000000 --- a/server/caddy/Caddyfile +++ /dev/null @@ -1,54 +0,0 @@ -{ - email {env.ACME_EMAIL} - # 如果你想强制使用 Cloudflare/阿里云 DNS 验证，可在每个站点 tls 块中指定 `dns`。 -} - -# 主站点（HTTPS 复用 443；/ray 提供 VLESS-WS 反代） -molecular.eu.org { - log { - output stdout - format console - } - # 若你需要 http->https 强制跳转，可加： - # redir https://{uri} permanent - - encode zstd gzip - - @vless_ws path /ray /ray/* - handle @vless_ws { - reverse_proxy v2ray:10000 { - header_up -Origin - } - } - - # VLESS gRPC over h2c at /grpc - @vless_grpc path /grpc /grpc/* - handle @vless_grpc { - reverse_proxy { - transport http { - versions h2c - } - to v2ray:10001 - } - } - - # 健康检查 - handle_path /_health* { - respond 200 - } - - # 静态站点或你的网站反代 - handle { - root * /usr/src/www - file_server - } - - # 证书：可根据你的 DNS 服务商二选一（或只保留其一） - tls { - dns cloudflare {env.CF_API_TOKEN} - #dns alidns { - # access_key_id {env.ALIYUN_ACCESS_KEY_ID} - # access_key_secret {env.ALIYUN_ACCESS_KEY_SECRET} - #} - } -} diff --git a/server/caddy/env/caddy.env b/server/caddy/env/caddy.env deleted file mode 100644 index d7f17ea..0000000 --- a/server/caddy/env/caddy.env +++ /dev/null @@ -1,10 +0,0 @@ -# ===== Caddy / ACME / DNS (Cloudflare) ===== -# 用于在 Let's Encrypt/ZeroSSL 注册证书的邮箱 -ACME_EMAIL=pylyzeng@gmail.com - -# 你的站点域名（当前 Caddyfile 已直接写死为 molecular.eu.org，此变量仅作记录） -DOMAIN=molecular.eu.org - -# Cloudflare API Token（至少授予：Zone:Read 与 Zone:DNS:Edit） -# 在 Caddyfile 中通过 {env.CF_API_TOKEN} 使用 -CF_API_TOKEN=ofvUY4Wo9-VN__AMglXHf8fVM1xtBRFfGN_Bsd-C diff --git a/server/caddy/env/caddy.env.example b/server/caddy/env/caddy.env.example deleted file mode 100644 index 234e89d..0000000 --- a/server/caddy/env/caddy.env.example +++ /dev/null @@ -1,14 +0,0 @@ -# ===== Caddy / ACME / DNS ===== -ACME_EMAIL= -DOMAIN= - -# Cloudflare (可选其一) -CLOUDFLARE_API_TOKEN= -CF_API_TOKEN= - -# 阿里云 (可选其一) -ALIYUN_ACCESS_KEY_ID= -ALIYUN_ACCESS_KEY_SECRET= - -# (L4 模式可选) 指定需要直达 L4 转发的 SNI -DERPER_HOST= diff --git a/server/caddy/l4.json b/server/caddy/l4.json deleted file mode 100644 index c839a42..0000000 --- a/server/caddy/l4.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "apps": { - "layer4": { - "servers": { - "tcp80": { - "listen": [ - "tcp/:80" - ], - "routes": [ - { - "handle": [ - { - "handler": "proxy", - "upstreams": [ - { - "dial": [ - "caddy-http:80" - ] - } - ] - } - ] - } - ] - }, - "tcp443": { - "listen": [ - "tcp/:443" - ], - "routes": [ - { - "match": [ - { - "tls": { - "sni": [ - "" - ] - } - } - ], - "handle": [ - { - "handler": "proxy", - "upstreams": [ - { - "dial": [ - "derper:443" - ] - } - ] - } - ] - }, - { - "handle": [ - { - "handler": "proxy", - "upstreams": [ - { - "dial": [ - "caddy-http:8443" - ] - } - ] - } - ] - } - ] - } - } - } - } -} \ No newline at end of file diff --git a/server/caddy/site/index.html b/server/caddy/site/index.html deleted file mode 100644 index e2efa9f..0000000 --- a/server/caddy/site/index.html +++ /dev/null @@ -1,3 +0,0 @@ - -OK -

It works.

HTTPS is up. VLESS-WS is on /ray.

diff --git a/server/docker-compose-l4.yml b/server/docker-compose-l4.yml deleted file mode 100644 index f3f7d95..0000000 --- a/server/docker-compose-l4.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: "3.9" - -services: - caddy-l4: - image: caddy-l4:latest - build: - context: . - dockerfile: Dockerfile.caddy-l4 - container_name: caddy-l4 - restart: unless-stopped - ports: - - "80:80/tcp" - - "443:443/tcp" - command: ["caddy","run","--config","/etc/caddy/caddy.json"] - env_file: - - ./caddy/env/caddy.env - volumes: - - ./caddy/l4.json:/etc/caddy/caddy.json:ro - - ./caddy/log:/data/log - depends_on: - - caddy-http - - caddy-http: - image: caddy-l4:latest - container_name: caddy-http - restart: unless-stopped - expose: - - "8443/tcp" - - "80/tcp" - environment: - - CADDY_LISTEN_HTTPS=:8443 - - CADDY_LISTEN_HTTP=:80 - - CADDY_ADMIN=:2019 - env_file: - - ./caddy/env/caddy.env - volumes: - - ./caddy/Caddyfile:/etc/caddy/Caddyfile:ro - - ./caddy/site:/usr/src/www:ro - - ./caddy/ssl:/data/caddy/certificates - - ./caddy/log:/data/log - depends_on: - - v2ray - - v2ray: - image: v2fly/v2fly-core:latest - container_name: v2ray - restart: unless-stopped - volumes: - - ./v2ray/config.json:/etc/v2ray/config.json:ro diff --git a/server/docker-compose.yml b/server/docker-compose.yml deleted file mode 100644 index bfc6476..0000000 --- a/server/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: "3.9" - -services: - caddy-http: - image: caddy-l4:latest - build: - context: . - dockerfile: Dockerfile.caddy-l4 - container_name: caddy-http - restart: unless-stopped - ports: - - "80:80/tcp" - - "443:443/tcp" - environment: - - CADDY_ADMIN=:2019 - env_file: - - ./caddy/env/caddy.env - volumes: - - ./caddy/Caddyfile:/etc/caddy/Caddyfile:ro - - ./caddy/site:/usr/src/www:ro - - ./caddy/ssl:/data/caddy/certificates - - ./caddy/log:/data/log - depends_on: - - v2ray - - v2ray: - image: v2fly/v2fly-core:latest - container_name: v2ray - restart: unless-stopped - volumes: - - ./v2ray/config.json:/etc/v2ray/config.json:ro - command: ["run", "-c", "/etc/v2ray/config.json"] diff --git a/server/v2ray/config.json b/server/v2ray/config.json deleted file mode 100644 index 6fc3478..0000000 --- a/server/v2ray/config.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "log": { - "loglevel": "warning" - }, - "inbounds": [ - { - "port": 10000, - "listen": "0.0.0.0", - "protocol": "vless", - "settings": { - "clients": [ - { - "id": "8f5e3b57-5a3d-4a3e-9f3c-9c6c2d6a9f1e" - } - ], - "decryption": "none" - }, - "streamSettings": { - "network": "ws", - "wsSettings": { - "path": "/ray" - } - } - }, - { - "port": 10001, - "listen": "0.0.0.0", - "protocol": "vless", - "settings": { - "clients": [ - { - "id": "8f5e3b57-5a3d-4a3e-9f3c-9c6c2d6a9f1e" - } - ], - "decryption": "none" - }, - "streamSettings": { - "network": "grpc", - "grpcSettings": { - "serviceName": "grpc", - "multiMode": true - } - } - } - ], - "outbounds": [ - { - "protocol": "freedom", - "settings": {} - } - ] -} \ No newline at end of file