From da8f2d08df6ccf7953019184e807dfc42cc95fc6 Mon Sep 17 00:00:00 2001 From: 3252a8 <3252a8@proton.me> Date: Sun, 17 May 2026 21:36:32 +0300 Subject: [PATCH] docs: caddy update --- deploy/compose/docker-compose-caddy.yml | 2 -- deploy/docker/caddy/Caddyfile | 11 ++++++----- docs/deployment.md | 24 +++++++++++++++++++++--- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/deploy/compose/docker-compose-caddy.yml b/deploy/compose/docker-compose-caddy.yml index d1c64fe..e4c4a00 100644 --- a/deploy/compose/docker-compose-caddy.yml +++ b/deploy/compose/docker-compose-caddy.yml @@ -123,8 +123,6 @@ services: caddy: image: caddy:2-alpine container_name: remnawave-minishop-caddy - environment: - PUBLIC_HOST: ${PUBLIC_HOST:-localhost} depends_on: frontend: condition: service_healthy diff --git a/deploy/docker/caddy/Caddyfile b/deploy/docker/caddy/Caddyfile index fb9721b..53afd2d 100644 --- a/deploy/docker/caddy/Caddyfile +++ b/deploy/docker/caddy/Caddyfile @@ -1,11 +1,12 @@ -{$PUBLIC_HOST:localhost} { +# Replace the example domains with your real webhook and Mini App hostnames. +app.example.com { encode zstd gzip - @webhooks path /tg/webhook /webhook/* - reverse_proxy @webhooks backend:8080 + reverse_proxy backend:8080 +} - @backend_health path /health /healthz - reverse_proxy @backend_health backend:8080 +web.example.com { + encode zstd gzip reverse_proxy frontend:80 } diff --git a/docs/deployment.md b/docs/deployment.md index 3a3b351..246b45a 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -58,6 +58,7 @@ docker compose logs migrate - `redis`: Redis 7 для FSM, кеша, rate-limit, очередей и locks. `deploy/compose/docker-compose-caddy.yml` добавляет `caddy` как внешний HTTP/HTTPS reverse proxy. +Перед запуском замените example-домены прямо в `deploy/docker/caddy/Caddyfile`. ## Логи и проверка @@ -193,9 +194,26 @@ docker compose up -d backend worker Вариант `deploy/compose/docker-compose-caddy.yml` проксирует: -- статические ассеты frontend; -- API и webhook-маршруты backend; -- эндпоинты проверки здоровья. +- webhook-домен целиком в `backend:8080`; +- Mini App-домен целиком в `frontend:80`; +- API/auth/theme routes Mini App дальше проксируются frontend nginx в `backend:8081`. + +Встроенный `deploy/docker/caddy/Caddyfile` намеренно повторяет старую двухдоменную структуру: + +```caddyfile +# Replace the example domains with your real webhook and Mini App hostnames. +app.example.com { + encode zstd gzip + + reverse_proxy backend:8080 +} + +web.example.com { + encode zstd gzip + + reverse_proxy frontend:80 +} +``` Для внешнего Nginx используйте DNS-имена сервисов внутри Docker network: