From 072d64d9ed9be1803c20748e62664fcb23b934ce Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 1 Nov 2026 17:07:28 +0200 Subject: [PATCH] After configuring the domain name6 --- deploy/vps-gateway/.env.example | 4 ++++ .../vps-gateway/nginx/prediqo.conf.template | 24 ++++++++++++++----- deploy/vps-gateway/nginx/salon.conf.template | 10 ++++++-- docs/DEPLOY-VPS.md | 10 ++++++++ package.json | 7 +++--- 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/deploy/vps-gateway/.env.example b/deploy/vps-gateway/.env.example index 179c0a14..4ca8493f 100644 --- a/deploy/vps-gateway/.env.example +++ b/deploy/vps-gateway/.env.example @@ -15,6 +15,10 @@ # VITE_WS_URL=wss://tloto.net/ws/v1/games/candle-predict # et rebuild : docker compose --profile https-dns up -d --build prediqo-web # (ou laisser https-dns down et ne garder que backend/web/redis/ws/engine/worker) +# +# Après recreate des backends Prediqo/Salon, si 502 sur /api : docker restart vps_gateway_nginx +# (ou depuis games-project : npm run gateway:reload). Les templates nginx re-résolvent +# les noms Docker via 127.0.0.11 pour limiter ce cas. CERTBOT_EMAIL=admin@tloto.net diff --git a/deploy/vps-gateway/nginx/prediqo.conf.template b/deploy/vps-gateway/nginx/prediqo.conf.template index 82542602..3819d804 100644 --- a/deploy/vps-gateway/nginx/prediqo.conf.template +++ b/deploy/vps-gateway/nginx/prediqo.conf.template @@ -12,6 +12,9 @@ server { } # Tloto / Prediqo — HTTPS sur 443 (URL publique sans port : https://${PREDIQO_DOMAIN}) +# +# Docker DNS (127.0.0.11) + upstreams en variables : après un rebuild Compose, +# les conteneurs changent d'IP ; sans ça nginx garde l'ancienne IP → 502. server { listen 443 ssl; http2 on; @@ -24,8 +27,12 @@ server { client_max_body_size 200m; + resolver 127.0.0.11 valid=10s ipv6=off; + resolver_timeout 5s; + location ~ ^/api/v1/app-updates/android/download/ { - proxy_pass http://crypto_wallet_api:4000; + set $prediqo_api crypto_wallet_api:4000; + proxy_pass http://$prediqo_api$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -39,7 +46,8 @@ server { } location ~ ^/api/v1/admin/mobile-releases/[^/]+/apk$ { - proxy_pass http://crypto_wallet_api:4000; + set $prediqo_api crypto_wallet_api:4000; + proxy_pass http://$prediqo_api$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -54,7 +62,8 @@ server { } location /api/ { - proxy_pass http://crypto_wallet_api:4000/api/; + set $prediqo_api crypto_wallet_api:4000; + proxy_pass http://$prediqo_api$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -66,7 +75,8 @@ server { } location = /health { - proxy_pass http://crypto_wallet_api:4000/health; + set $prediqo_api crypto_wallet_api:4000; + proxy_pass http://$prediqo_api$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -75,7 +85,8 @@ server { } location /ws/ { - proxy_pass http://crypto_wallet_ws:4001; + set $prediqo_ws crypto_wallet_ws:4001; + proxy_pass http://$prediqo_ws$request_uri; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -87,7 +98,8 @@ server { } location / { - proxy_pass http://prediqo-web:80/; + set $prediqo_web prediqo-web:80; + proxy_pass http://$prediqo_web$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/deploy/vps-gateway/nginx/salon.conf.template b/deploy/vps-gateway/nginx/salon.conf.template index 13b1dae3..5f0a1fb8 100644 --- a/deploy/vps-gateway/nginx/salon.conf.template +++ b/deploy/vps-gateway/nginx/salon.conf.template @@ -13,6 +13,7 @@ server { } # Salon — HTTPS +# Docker DNS + upstreams variables (évite 502 après recreate des conteneurs Salon). server { listen 443 ssl; http2 on; @@ -25,8 +26,12 @@ server { client_max_body_size 20m; + resolver 127.0.0.11 valid=10s ipv6=off; + resolver_timeout 5s; + location /api/ { - proxy_pass http://business_mgt_backend:5001/api/; + set $salon_api business_mgt_backend:5001; + proxy_pass http://$salon_api$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -35,7 +40,8 @@ server { } location / { - proxy_pass http://business_mgt_frontend_with_vite:5002/; + set $salon_web business_mgt_frontend_with_vite:5002; + proxy_pass http://$salon_web$request_uri; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/docs/DEPLOY-VPS.md b/docs/DEPLOY-VPS.md index f44355fb..27aaba1a 100644 --- a/docs/DEPLOY-VPS.md +++ b/docs/DEPLOY-VPS.md @@ -945,12 +945,14 @@ Local Docker : `npm run docker:local:break-glass-reset-2fa -- …` (fichier `.en | **1er déploiement HTTPS (VPS)** | `npm run phase-b:init:https` | | **1er démarrage local Docker** | `npm run docker:local:init` | | Démarrer / rebuild (HTTP VPS) | `npm run phase-b:up` | +| Démarrer / rebuild (HTTPS + gateway) | `npm run phase-b:up:https` (redémarre aussi `vps_gateway_nginx` s’il existe) | | Démarrer local Docker | `npm run docker:local:up` | | Migrations seules (VPS) | `npm run db:migrate` | | Migrations seules (local Docker) | `npm run docker:local:migrate` | | État des conteneurs | `npm run phase-b:status` | | Logs en direct | `npm run phase-b:logs` | | Redémarrer | `npm run phase-b:restart` | +| Recharger la passerelle 80/443 | `npm run gateway:reload` (si login/API en 502 après rebuild) | | Arrêter | `npm run phase-b:down` | | Remise à zéro DB | [§4.1](#41-remise-à-zéro--supprimer-et-recréer-la-base-avant-tests-réels) | | Seed hot wallets (TRON + BSC) | `docker compose run --rm --no-deps backend node dist/scripts/seedHotWallets.js` | @@ -973,8 +975,16 @@ docker compose logs -f nginx-https-dns cd ~/games_app git pull npm run phase-b:up:https +# Vérifier : curl -sS https://tloto.net/health → doit renvoyer {"status":"ok",...} ``` +### 502 Bad Gateway après rebuild (passerelle VPS) + +Cause fréquente : `vps_gateway_nginx` a résolu `crypto_wallet_api` vers une **ancienne IP Docker**. Le front (`prediqo-web`) peut encore répondre, mais `/api` et `/health` renvoient 502. + +- **Immédiat** : `sudo npm run gateway:reload` (ou `sudo docker restart vps_gateway_nginx`) +- **Prévention** : `phase-b:up` / `phase-b:up:https` redémarrent déjà le gateway ; le template `deploy/vps-gateway/nginx/prediqo.conf.template` utilise le DNS Docker (`resolver 127.0.0.11`) pour re-résoudre les upstreams. Après pull de ce fix : `cd deploy/vps-gateway && sudo docker compose up -d` (recharge les templates). + Si seul le backend a changé (pas le frontend) : ```bash diff --git a/package.json b/package.json index 3b50f36f..ab65eaa7 100644 --- a/package.json +++ b/package.json @@ -5,19 +5,20 @@ "scripts": { "phase-b:init": "docker compose run --rm --no-deps --build backend node dist/db/migrate.js && docker compose --profile http up -d --build", "phase-b:init:https": "docker compose run --rm --no-deps --build backend node dist/db/migrate.js && docker compose --profile https-dns up -d --build", - "phase-b:up": "docker compose --profile http up -d --build", + "phase-b:up": "docker compose --profile http up -d --build && docker restart vps_gateway_nginx >/dev/null 2>&1 || true", "docker:local:up": "docker compose --env-file .env.docker --profile http up -d --build", "docker:local:init": "docker compose --env-file .env.docker run --rm --no-deps --build backend node dist/db/migrate.js && docker compose --env-file .env.docker --profile http up -d --build", "docker:local:down": "docker compose --env-file .env.docker --profile http down", "docker:local:migrate": "docker compose --env-file .env.docker run --rm --no-deps backend node dist/db/migrate.js", "docker:local:logs": "docker compose --env-file .env.docker logs -f nginx backend backend-engine backend-ws backend-worker-bets redis prediqo-web", "docker:local:status": "docker compose --env-file .env.docker ps", - "phase-b:up:https": "docker compose --profile https-dns up -d --build", - "phase-b:up:ssl": "docker compose --profile ssl up -d --build", + "phase-b:up:https": "docker compose --profile https-dns up -d --build && docker restart vps_gateway_nginx >/dev/null 2>&1 || true", + "phase-b:up:ssl": "docker compose --profile ssl up -d --build && docker restart vps_gateway_nginx >/dev/null 2>&1 || true", "phase-b:down": "docker compose down", "phase-b:logs": "docker compose logs -f nginx-https-dns nginx backend backend-engine backend-ws backend-worker-bets redis prediqo-web", "phase-b:restart": "docker compose --profile https-dns restart nginx-https-dns backend backend-engine backend-ws backend-worker-bets prediqo-web", "phase-b:status": "docker compose ps", + "gateway:reload": "docker restart vps_gateway_nginx", "ssl:init": "docker compose --profile ssl-init run --rm certbot-init", "ssl:dns-init": "docker compose --profile dns-init run --rm -it certbot-dns-init", "ssl:dns-renew": "docker compose --profile dns-renew run --rm -it certbot-dns-renew",