diff --git a/server/Caddyfile.example b/server/Caddyfile.example index f8c7920..6672e23 100644 --- a/server/Caddyfile.example +++ b/server/Caddyfile.example @@ -1,12 +1,30 @@ -# 方式一:独立子域名(DNS 添加 sync.linyux.cn A 记录后使用) -sync.linyux.cn { - reverse_proxy 127.0.0.1:3780 +gitea.linyux.cn { + handle_path /sync-api/* { + reverse_proxy internlog-sync:3780 + } + handle { + reverse_proxy gitea:3000 + } } -# 方式二:复用现有域名路径(并入 gitea.linyux.cn 的站点块,不要单独建站) -# gitea.linyux.cn { -# handle_path /sync-api/* { -# reverse_proxy 127.0.0.1:3780 -# } -# # ...原有 Gitea 反代配置 -# } +img.linyux.cn { + reverse_proxy lsky:8089 +} + +halo.linyux.cn, www.linyux.cn { + root * /www + @static { + path /BingSiteAuth.xml + } + handle @static { + root * /www + file_server + } + handle { + reverse_proxy halo:8090 + } +} + +umami.linyux.cn { + reverse_proxy umami:3000 +} diff --git a/server/docker-compose.yml b/server/docker-compose.yml index e01599b..61c0fbb 100644 --- a/server/docker-compose.yml +++ b/server/docker-compose.yml @@ -2,23 +2,17 @@ services: internlog-sync: build: . container_name: internlog-sync - ports: - - "3780:3780" + restart: unless-stopped volumes: - ./data:/app/data - restart: unless-stopped + networks: + - proxy-net - # 可选:Caddy 自动 HTTPS。若宿主机已有 Caddy/nginx 占用 80/443,请改用 - # 现有反代添加站点块(见 DEPLOY.md),不要启用本段。 - # - # caddy: - # image: caddy:2-alpine - # container_name: internlog-caddy - # ports: - # - "80:80" - # - "443:443" - # volumes: - # - ./Caddyfile:/etc/caddy/Caddyfile:ro - # - ./caddy_data:/data - # - ./caddy_config:/config - # restart: unless-stopped +# 让 Caddy 能用容器名 internlog-sync 直接访问本服务。 +# 请先查出 Caddy 与 gitea 所在的共享网络名: +# docker inspect gitea --format '{{range $k,$v := .NetworkSettings.Networks}}{{$k}} {{end}}' +# 把下面 name 替换成查到的网络名。若 Caddy 与本服务同属一个 compose 项目则可删掉 networks 配置。 +networks: + proxy-net: + name: proxy-net + external: true