From ecc506188509f286c3412cf65051474aa0998a8a Mon Sep 17 00:00:00 2001 From: 4NK Dev Date: Sun, 5 Oct 2025 22:54:38 +0000 Subject: [PATCH] ci: docker_tag=dev-test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Ajout de la génération dynamique des ports pour Nginx dans docker-compose.yml.auto - Nginx a maintenant accès à tous les ports de tous les services pour le routage - Correction de la génération de la variable HOST dans generate_variables.sh - Amélioration du nettoyage des ports vides dans docker-compose.yml.auto - Génération automatique de toutes les configurations Nginx (upstreams, internes, HTTPS) - Nginx traité comme un module dans _4NK_modules/nginx/ - Tous les ports de tous les services ajoutés aux configurations Nginx - Correction des chemins relatifs dans les scripts de génération - Système de templates complètement fonctionnel avec remplacement des variables --- storage/dev/.env.auto | 47 +- .../dev/_4NK_modules/promtail/promtail.yml | 8 +- storage/dev/docker-compose.yml.auto | 253 ++-- .../projects/lecoffre/docker-compose.yml.auto | 44 - .../lecoffre_node/docker-compose.yml.auto | 72 +- templates/dev/.env | 2 +- templates/dev/.env.auto | 47 +- .../dashboards/{ngnix.json => nginx.json} | 20 +- .../dev/_4NK_modules/nginx/BITCOIN_https.conf | 16 +- .../nginx/BLINDBIT_ORACLE_https.conf | 16 +- .../dev/_4NK_modules/nginx/GRAFANA_https.conf | 16 +- .../_4NK_modules/nginx/IHM_CLIENT_https.conf | 16 +- .../nginx/LECOFFRE_FRONT_https.conf | 16 +- .../dev/_4NK_modules/nginx/LOKI_https.conf | 16 +- .../{NGNIX_https.conf => NGINX_https.conf} | 24 +- .../_4NK_modules/nginx/POSTGRESQL_https.conf | 16 +- .../_4NK_modules/nginx/PROMTAIL_https.conf | 16 +- .../dev/_4NK_modules/nginx/REDIS_https.conf | 16 +- .../_4NK_modules/nginx/SDK_RELAY_https.conf | 16 +- .../_4NK_modules/nginx/SDK_STORAGE_https.conf | 16 +- .../dev/_4NK_modules/nginx/TOR_https.conf | 16 +- .../nginx/_4NK_CERTIFICATOR_https.conf | 16 +- .../_4NK_modules/nginx/_4NK_MINER_https.conf | 16 +- .../_4NK_modules/nginx/_4NK_VAULT_https.conf | 16 +- .../nginx/_4NK_WEB_STATUS_https.conf | 16 +- .../nginx/app-internal-ports.conf | 1169 ++++++++++++++++- .../nginx/nginx_dev4._4NKweb.com-https.conf | 80 +- .../dev/_4NK_modules/nginx/upstreams.conf | 269 +++- .../dev/_4NK_modules/promtail/promtail.yml | 8 +- templates/dev/docker-compose.yml.auto | 345 ++--- templates/dev/generate_nginx_configs.sh | 168 ++- templates/dev/generate_variables.sh | 62 +- .../dev/logrotade/{ngnix.conf => nginx.conf} | 4 +- .../lecoffre_node/docker-compose.yml.auto | 30 + templates/dev/replace_variables_and_copy.sh | 47 +- 35 files changed, 2273 insertions(+), 682 deletions(-) rename templates/dev/_4NK_modules/grafana/dashboards/{ngnix.json => nginx.json} (93%) rename templates/dev/_4NK_modules/nginx/{NGNIX_https.conf => NGINX_https.conf} (50%) rename templates/dev/logrotade/{ngnix.conf => nginx.conf} (68%) diff --git a/storage/dev/.env.auto b/storage/dev/.env.auto index 7691dbf..0b1c742 100644 --- a/storage/dev/.env.auto +++ b/storage/dev/.env.auto @@ -1,3 +1,6 @@ +# ====== BASE VARIABLES ====== +HOST=dev4._4NKweb.com + # ====== INTERNAL REDIS ====== REDIS_DOCKER_NAME=redis @@ -128,30 +131,30 @@ GRAFANA_URL_WS=ws://3001:3001 GRAFANA_URL_WS_EXTERNAL=wss://dev4._4NKweb.com/ws -# ====== INTERNAL NGNIX ====== +# ====== INTERNAL NGINX ====== -NGNIX_DOCKER_NAME=ngnix -NGNIX_CONFS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ngnix -NGNIX_LOGS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ngnix -NGNIX_RUNS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/ngnix -NGNIX_DATAS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/ngnix -NGNIX_BACKUPS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/ngnix -NGNIX_SCRIPTS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/ngnix -NGNIX_DOCKER_WORKING_DIR=/home/ngnix +NGINX_DOCKER_NAME=nginx +NGINX_CONFS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx +NGINX_LOGS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx +NGINX_RUNS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/nginx +NGINX_DATAS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/nginx +NGINX_BACKUPS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/nginx +NGINX_SCRIPTS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/nginx +NGINX_DOCKER_WORKING_DIR=/home/nginx -NGNIX_DOCKER_CONFS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ngnix -NGNIX_DOCKER_LOGS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ngnix -NGNIX_DOCKER_RUNS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/ngnix -NGNIX_DOCKER_DATAS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/ngnix -NGNIX_DOCKER_BACKUPS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/ngnix -NGNIX_DOCKER_SCRIPTS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/ngnix -NGNIX_DOCKER_WORKING_DIR_CREATE="id -u >/dev/null 2>&1 || adduser --disabled-password --gecos '' ; chown -R : /home/root/. || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec \"$@\"" -NGNIX_DOCKER_PORT= -NGNIX_URL_ROUTE=/ngnix -NGNIX_URL=http://ngnix: -NGNIX_URL_EXTERNAL=https://dev4._4NKweb.com/ngnix -NGNIX_URL_WS=ws:// -NGNIX_URL_WS_EXTERNAL=wss://dev4._4NKweb.com/ws +NGINX_DOCKER_CONFS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx +NGINX_DOCKER_LOGS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx +NGINX_DOCKER_RUNS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/nginx +NGINX_DOCKER_DATAS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/nginx +NGINX_DOCKER_BACKUPS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/nginx +NGINX_DOCKER_SCRIPTS_DIR=/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/nginx +NGINX_DOCKER_WORKING_DIR_CREATE="id -u nginx >/dev/null 2>&1 || adduser --disabled-password --gecos '' nginx; chown -R nginx:nginx /home/root/.nginx || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec \"$@\"" +NGINX_DOCKER_PORT=443 +NGINX_URL_ROUTE=/nginx +NGINX_URL=http://nginx:443 +NGINX_URL_EXTERNAL=https://dev4._4NKweb.com/nginx +NGINX_URL_WS=ws://443 +NGINX_URL_WS_EXTERNAL=wss://dev4._4NKweb.com/ws # ====== INTERNAL TOR ====== diff --git a/storage/dev/_4NK_modules/promtail/promtail.yml b/storage/dev/_4NK_modules/promtail/promtail.yml index 5c6bac9..e33091c 100644 --- a/storage/dev/_4NK_modules/promtail/promtail.yml +++ b/storage/dev/_4NK_modules/promtail/promtail.yml @@ -105,16 +105,16 @@ scrape_configs: source: timestamp format: '2006-01-02 15:04:05' - - job_name: 'NGNIX' + - job_name: 'NGINX' static_configs: - targets: - localhost labels: - job: NGNIX - __path__: /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ngnix/*.log + job: NGINX + __path__: /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/*.log pipeline_stages: - match: - selector: '{job="NGNIX"}' + selector: '{job="NGINX"}' stages: - regex: expression: '^(?P\S+\s\S+)\s+(?P\S+)\s+(?P.*)' diff --git a/storage/dev/docker-compose.yml.auto b/storage/dev/docker-compose.yml.auto index e2de276..d97a677 100644 --- a/storage/dev/docker-compose.yml.auto +++ b/storage/dev/docker-compose.yml.auto @@ -1,16 +1,12 @@ services: - redis: image: container_name: redis working_dir: /redis ports: - - "0.0.0.0:" - - "0.0.0.0:6379:6379" - - "0.0.0.0:" - - "0.0.0.0:" + - "6379:6379:6379:6379" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/redis:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/redis - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/redis:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/redis @@ -24,23 +20,19 @@ services: - redis user: root entrypoint: \> - /bin/sh -c "id -u redis >/dev/null 2>&1 || adduser --disabled-password --gecos '' redis; chown -R redis:redis /home/root/.redis || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u redis >/dev/null 2>&1 || adduser --disabled-password --gecos '' redis; chown -R redis:redis /home/root/.redis || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_redis.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_redis.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped postgresql: image: container_name: postgresql working_dir: /postgresql ports: - - "0.0.0.0:" - - "0.0.0.0:5432:5432" - - "0.0.0.0:" - - "0.0.0.0:" + - "5432:5432:5432:5432" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/postgresql:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/postgresql - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/postgresql:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/postgresql @@ -54,23 +46,20 @@ services: - postgresql user: root entrypoint: \> - /bin/sh -c "id -u postgresql >/dev/null 2>&1 || adduser --disabled-password --gecos '' postgresql; chown -R postgresql:postgresql /home/root/.postgresql || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u postgresql >/dev/null 2>&1 || adduser --disabled-password --gecos '' postgresql; chown -R postgresql:postgresql /home/root/.postgresql || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_postgresql.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_postgresql.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped loki: image: container_name: loki working_dir: /loki ports: - - "0.0.0.0:" - - "0.0.0.0:3100:3100" - - "0.0.0.0:9096" - - "0.0.0.0:" + - "3100:3100:3100:3100" + - "9096:9096" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/loki:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/loki - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/loki:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/loki @@ -84,23 +73,19 @@ services: - loki user: root entrypoint: \> - /bin/sh -c "id -u loki >/dev/null 2>&1 || adduser --disabled-password --gecos '' loki; chown -R loki:loki /home/root/.loki || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u loki >/dev/null 2>&1 || adduser --disabled-password --gecos '' loki; chown -R loki:loki /home/root/.loki || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_loki.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_loki.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped promtail: image: container_name: promtail working_dir: /promtail ports: - - "0.0.0.0:" - - "0.0.0.0:8090:8090" - - "0.0.0.0:" - - "0.0.0.0:" + - "8090:8090:8090:8090" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/promtail:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/promtail - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/promtail:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/promtail @@ -114,23 +99,19 @@ services: - promtail user: root entrypoint: \> - /bin/sh -c "id -u promtail >/dev/null 2>&1 || adduser --disabled-password --gecos '' promtail; chown -R promtail:promtail /home/root/.promtail || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u promtail >/dev/null 2>&1 || adduser --disabled-password --gecos '' promtail; chown -R promtail:promtail /home/root/.promtail || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_promtail.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_promtail.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped grafana: image: container_name: grafana working_dir: /grafana ports: - - "0.0.0.0:" - - "0.0.0.0:3001:3001" - - "0.0.0.0:" - - "0.0.0.0:" + - "3001:3001:3001:3001" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/grafana:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/grafana - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/grafana:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/grafana @@ -144,53 +125,68 @@ services: - grafana user: root entrypoint: \> - /bin/sh -c "id -u grafana >/dev/null 2>&1 || adduser --disabled-password --gecos '' grafana; chown -R grafana:grafana /home/root/.grafana || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u grafana >/dev/null 2>&1 || adduser --disabled-password --gecos '' grafana; chown -R grafana:grafana /home/root/.grafana || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_grafana.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_grafana.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - - ngnix: + restart: unless-stopped + nginx: image: - container_name: ngnix - working_dir: /ngnix + container_name: nginx + working_dir: /nginx ports: - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" + - "443:443" + - "80:80" + - "6379:6379:6379:6379" + - "5432:5432:5432:5432" + - "3100:3100:3100:3100" + - "9096:9096" + - "8090:8090:8090:8090" + - "3001:3001:3001:3001" + - "9050:9050:9050:9050" + - "38333:38333:38333:38333" + - "38332:38332:38332:38332" + - "29001:29001:29001:29001" + - "29000:29000:29000:29000" + - "38332:38332" + - "38333:38333" + - "8000:8000:8000:8000" + - "8080:8080:8080:8080" + - "8081:8081:8081:8081" + - "3003:3003:3003:3003" + - "8082:8082:8082:8082" + - "8083:8083:8083:8083" + - "3000:3000:3000:3000" + - "3006:3006:3006:3006" + - "3006:3006:3006:3006" volumes: - - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ngnix:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ngnix - - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ngnix:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ngnix - - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/ngnix:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/ngnix - - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/ngnix:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/ngnix - - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/ngnix:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/ngnix - - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/ngnix:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/ngnix + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/nginx networks: btcnet: aliases: - - ngnix + - nginx user: root entrypoint: \> - /bin/sh -c "id -u >/dev/null 2>&1 || adduser --disabled-password --gecos '' ; chown -R : /home/root/. || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u nginx >/dev/null 2>&1 || adduser --disabled-password --gecos '' nginx; chown -R nginx:nginx /home/root/.nginx || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_nginx.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped tor: image: container_name: tor working_dir: /tor ports: - - "0.0.0.0:" - - "0.0.0.0:9050:9050" - - "0.0.0.0:" - - "0.0.0.0:" + - "9050:9050:9050:9050" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/tor:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/tor - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/tor:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/tor @@ -204,23 +200,18 @@ services: - tor user: root entrypoint: \> - /bin/sh -c "id -u tor-proxy >/dev/null 2>&1 || adduser --disabled-password --gecos '' tor-proxy; chown -R tor-proxy:tor-proxy /home/root/.tor-proxy || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u tor-proxy >/dev/null 2>&1 || adduser --disabled-password --gecos '' tor-proxy; chown -R tor-proxy:tor-proxy /home/root/.tor-proxy || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_tor-proxy.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_tor-proxy.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped _4nk_vault: image: container_name: _4nk_vault working_dir: /_4nk_vault ports: - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_vault:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_vault - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_vault:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_vault @@ -234,23 +225,24 @@ services: - _4nk_vault user: root entrypoint: \> - /bin/sh -c "id -u _4NK_vault >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_vault; chown -R _4NK_vault:_4NK_vault /home/root/._4NK_vault || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u _4NK_vault >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_vault; chown -R _4NK_vault:_4NK_vault /home/root/._4NK_vault || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck__4NK_vault.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck__4NK_vault.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped bitcoin: image: container_name: bitcoin working_dir: /bitcoin ports: - - "0.0.0.0:38333:38333" - - "0.0.0.0:38332:38332" - - "0.0.0.0:29001:29001" - - "0.0.0.0:29000:29000" + - "38333:38333:38333:38333" + - "38332:38332:38332:38332" + - "29001:29001:29001:29001" + - "29000:29000:29000:29000" + - "38332:38332" + - "38333:38333" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/bitcoin:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/bitcoin - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/bitcoin:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/bitcoin @@ -264,23 +256,19 @@ services: - bitcoin user: root entrypoint: \> - /bin/sh -c "id -u bitcoin >/dev/null 2>&1 || adduser --disabled-password --gecos '' bitcoin; chown -R bitcoin:bitcoin /home/root/.bitcoin || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u bitcoin >/dev/null 2>&1 || adduser --disabled-password --gecos '' bitcoin; chown -R bitcoin:bitcoin /home/root/.bitcoin || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_bitcoin.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_bitcoin.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped blindbit_oracle: image: container_name: blindbit_oracle working_dir: /blindbit_oracle ports: - - "0.0.0.0:" - - "0.0.0.0:8000:8000" - - "0.0.0.0:" - - "0.0.0.0:" + - "8000:8000:8000:8000" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/blindbit_oracle:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/blindbit_oracle - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/blindbit_oracle:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/blindbit_oracle @@ -294,23 +282,19 @@ services: - blindbit_oracle user: root entrypoint: \> - /bin/sh -c "id -u blindbit-oracle >/dev/null 2>&1 || adduser --disabled-password --gecos '' blindbit-oracle; chown -R blindbit-oracle:blindbit-oracle /home/root/.blindbit-oracle || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u blindbit-oracle >/dev/null 2>&1 || adduser --disabled-password --gecos '' blindbit-oracle; chown -R blindbit-oracle:blindbit-oracle /home/root/.blindbit-oracle || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_blindbit-oracle.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_blindbit-oracle.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped sdk_relay: image: container_name: sdk_relay working_dir: /sdk_relay ports: - - "0.0.0.0:" - - "0.0.0.0:8080:8080" - - "0.0.0.0:" - - "0.0.0.0:" + - "8080:8080:8080:8080" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_relay:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_relay - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_relay:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_relay @@ -324,23 +308,19 @@ services: - sdk_relay user: root entrypoint: \> - /bin/sh -c "id -u sdk_relay >/dev/null 2>&1 || adduser --disabled-password --gecos '' sdk_relay; chown -R sdk_relay:sdk_relay /home/root/.sdk_relay || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u sdk_relay >/dev/null 2>&1 || adduser --disabled-password --gecos '' sdk_relay; chown -R sdk_relay:sdk_relay /home/root/.sdk_relay || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_sdk_relay.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_sdk_relay.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped sdk_storage: image: container_name: sdk_storage working_dir: /sdk_storage ports: - - "0.0.0.0:" - - "0.0.0.0:8081:8081" - - "0.0.0.0:" - - "0.0.0.0:" + - "8081:8081:8081:8081" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_storage:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_storage - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_storage:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_storage @@ -354,23 +334,19 @@ services: - sdk_storage user: root entrypoint: \> - /bin/sh -c "id -u sdk_storage >/dev/null 2>&1 || adduser --disabled-password --gecos '' sdk_storage; chown -R sdk_storage:sdk_storage /home/root/.sdk_storage || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u sdk_storage >/dev/null 2>&1 || adduser --disabled-password --gecos '' sdk_storage; chown -R sdk_storage:sdk_storage /home/root/.sdk_storage || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_sdk_storage.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_sdk_storage.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped ihm_client: image: container_name: ihm_client working_dir: /ihm_client ports: - - "0.0.0.0:" - - "0.0.0.0:3003:3003" - - "0.0.0.0:" - - "0.0.0.0:" + - "3003:3003:3003:3003" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ihm_client:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ihm_client - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ihm_client:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ihm_client @@ -384,23 +360,19 @@ services: - ihm_client user: root entrypoint: \> - /bin/sh -c "id -u ihm_client >/dev/null 2>&1 || adduser --disabled-password --gecos '' ihm_client; chown -R ihm_client:ihm_client /home/root/.ihm_client || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u ihm_client >/dev/null 2>&1 || adduser --disabled-password --gecos '' ihm_client; chown -R ihm_client:ihm_client /home/root/.ihm_client || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_ihm_client.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_ihm_client.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped _4nk_certificator: image: container_name: _4nk_certificator working_dir: /_4nk_certificator ports: - - "0.0.0.0:" - - "0.0.0.0:8082:8082" - - "0.0.0.0:" - - "0.0.0.0:" + - "8082:8082:8082:8082" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_certificator:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_certificator - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_certificator:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_certificator @@ -414,23 +386,19 @@ services: - _4nk_certificator user: root entrypoint: \> - /bin/sh -c "id -u _4NK_certificator >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_certificator; chown -R _4NK_certificator:_4NK_certificator /home/root/._4NK_certificator || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u _4NK_certificator >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_certificator; chown -R _4NK_certificator:_4NK_certificator /home/root/._4NK_certificator || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck__4NK_certificator.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck__4NK_certificator.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped _4nk_miner: image: container_name: _4nk_miner working_dir: /_4nk_miner ports: - - "0.0.0.0:" - - "0.0.0.0:8083:8083" - - "0.0.0.0:" - - "0.0.0.0:" + - "8083:8083:8083:8083" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_miner:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_miner - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_miner:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_miner @@ -444,23 +412,19 @@ services: - _4nk_miner user: root entrypoint: \> - /bin/sh -c "id -u _4NK_miner >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_miner; chown -R _4NK_miner:_4NK_miner /home/root/._4NK_miner || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u _4NK_miner >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_miner; chown -R _4NK_miner:_4NK_miner /home/root/._4NK_miner || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck__4NK_miner.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck__4NK_miner.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped lecoffre_front: image: container_name: lecoffre_front working_dir: /lecoffre_front ports: - - "0.0.0.0:" - - "0.0.0.0:3000:3000" - - "0.0.0.0:" - - "0.0.0.0:" + - "3000:3000:3000:3000" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/lecoffre_front:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/lecoffre_front - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/lecoffre_front:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/lecoffre_front @@ -474,23 +438,20 @@ services: - lecoffre_front user: root entrypoint: \> - /bin/sh -c "id -u lecoffre-front >/dev/null 2>&1 || adduser --disabled-password --gecos '' lecoffre-front; chown -R lecoffre-front:lecoffre-front /home/root/.lecoffre-front || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u lecoffre-front >/dev/null 2>&1 || adduser --disabled-password --gecos '' lecoffre-front; chown -R lecoffre-front:lecoffre-front /home/root/.lecoffre-front || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_lecoffre-front.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck_lecoffre-front.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped _4nk_web_status: image: container_name: _4nk_web_status working_dir: /_4nk_web_status ports: - - "0.0.0.0:3006:3006" - - "0.0.0.0:3006:3006" - - "0.0.0.0:" - - "0.0.0.0:" + - "3006:3006:3006:3006" + - "3006:3006:3006:3006" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_web_status:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_web_status - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_web_status:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_web_status @@ -504,13 +465,13 @@ services: - _4nk_web_status user: root entrypoint: \> - /bin/sh -c "id -u _4NK_web_status >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_web_status; chown -R _4NK_web_status:_4NK_web_status /home/root/._4NK_web_status || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + /bin/sh -c \"id -u _4NK_web_status >/dev/null 2>&1 || adduser --disabled-password --gecos '' _4NK_web_status; chown -R _4NK_web_status:_4NK_web_status /home/root/._4NK_web_status || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec ""\" healthcheck: - test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck__4NK_web_status.sh"] + test: [\"CMD\", \"sh\", \"-FRONT_CONFS_DIR/healthcheck__4NK_web_status.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" + restart: unless-stopped watchtower: diff --git a/storage/dev/projects/lecoffre/docker-compose.yml.auto b/storage/dev/projects/lecoffre/docker-compose.yml.auto index 305b27e..ead66a0 100644 --- a/storage/dev/projects/lecoffre/docker-compose.yml.auto +++ b/storage/dev/projects/lecoffre/docker-compose.yml.auto @@ -7,10 +7,7 @@ services: container_name: redis working_dir: /redis ports: - - "0.0.0.0:" - "0.0.0.0:6379:6379" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/redis:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/redis - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/redis:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/redis @@ -37,10 +34,7 @@ services: container_name: postgresql working_dir: /postgresql ports: - - "0.0.0.0:" - "0.0.0.0:5432:5432" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/postgresql:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/postgresql - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/postgresql:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/postgresql @@ -67,10 +61,8 @@ services: container_name: loki working_dir: /loki ports: - - "0.0.0.0:" - "0.0.0.0:3100:3100" - "0.0.0.0:9096" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/loki:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/loki - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/loki:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/loki @@ -97,10 +89,7 @@ services: container_name: promtail working_dir: /promtail ports: - - "0.0.0.0:" - "0.0.0.0:8090:8090" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/promtail:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/promtail - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/promtail:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/promtail @@ -127,10 +116,7 @@ services: container_name: grafana working_dir: /grafana ports: - - "0.0.0.0:" - "0.0.0.0:3001:3001" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/grafana:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/grafana - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/grafana:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/grafana @@ -157,10 +143,6 @@ services: container_name: _4nk_vault working_dir: /_4nk_vault ports: - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_vault:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_vault - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_vault:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_vault @@ -187,10 +169,7 @@ services: container_name: tor working_dir: /tor ports: - - "0.0.0.0:" - "0.0.0.0:9050:9050" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/tor:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/tor - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/tor:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/tor @@ -247,10 +226,7 @@ services: container_name: blindbit_oracle working_dir: /blindbit_oracle ports: - - "0.0.0.0:" - "0.0.0.0:8000:8000" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/blindbit_oracle:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/blindbit_oracle - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/blindbit_oracle:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/blindbit_oracle @@ -277,10 +253,7 @@ services: container_name: sdk_relay working_dir: /sdk_relay ports: - - "0.0.0.0:" - "0.0.0.0:8080:8080" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_relay:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_relay - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_relay:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_relay @@ -307,10 +280,7 @@ services: container_name: sdk_storage working_dir: /sdk_storage ports: - - "0.0.0.0:" - "0.0.0.0:8081:8081" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_storage:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_storage - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_storage:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_storage @@ -337,10 +307,7 @@ services: container_name: ihm_client working_dir: /ihm_client ports: - - "0.0.0.0:" - "0.0.0.0:3003:3003" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ihm_client:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ihm_client - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ihm_client:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ihm_client @@ -367,10 +334,7 @@ services: container_name: _4nk_certificator working_dir: /_4nk_certificator ports: - - "0.0.0.0:" - "0.0.0.0:8082:8082" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_certificator:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_certificator - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_certificator:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_certificator @@ -397,10 +361,7 @@ services: container_name: _4nk_miner working_dir: /_4nk_miner ports: - - "0.0.0.0:" - "0.0.0.0:8083:8083" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_miner:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_miner - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_miner:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_miner @@ -427,10 +388,7 @@ services: container_name: lecoffre_front working_dir: /lecoffre_front ports: - - "0.0.0.0:" - "0.0.0.0:3000:3000" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/lecoffre_front:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/lecoffre_front - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/lecoffre_front:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/lecoffre_front @@ -459,8 +417,6 @@ services: ports: - "0.0.0.0:3006:3006" - "0.0.0.0:3006:3006" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_web_status:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_web_status - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_web_status:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_web_status diff --git a/storage/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto b/storage/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto index 305b27e..68e91dc 100644 --- a/storage/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto +++ b/storage/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto @@ -7,10 +7,7 @@ services: container_name: redis working_dir: /redis ports: - - "0.0.0.0:" - "0.0.0.0:6379:6379" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/redis:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/redis - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/redis:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/redis @@ -37,10 +34,7 @@ services: container_name: postgresql working_dir: /postgresql ports: - - "0.0.0.0:" - "0.0.0.0:5432:5432" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/postgresql:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/postgresql - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/postgresql:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/postgresql @@ -67,10 +61,8 @@ services: container_name: loki working_dir: /loki ports: - - "0.0.0.0:" - "0.0.0.0:3100:3100" - "0.0.0.0:9096" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/loki:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/loki - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/loki:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/loki @@ -97,10 +89,7 @@ services: container_name: promtail working_dir: /promtail ports: - - "0.0.0.0:" - "0.0.0.0:8090:8090" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/promtail:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/promtail - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/promtail:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/promtail @@ -127,10 +116,7 @@ services: container_name: grafana working_dir: /grafana ports: - - "0.0.0.0:" - "0.0.0.0:3001:3001" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/grafana:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/grafana - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/grafana:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/grafana @@ -152,15 +138,39 @@ services: retries: 50 restart: unless-stopped" + nginx: + image: + container_name: nginx + working_dir: /nginx + ports: + - "0.0.0.0:443" + - "0.0.0.0:80" + volumes: + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/runs/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/datas/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/backups/nginx + - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/nginx:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/scripts/nginx + networks: + btcnet: + aliases: + - nginx + user: root + entrypoint: \> + /bin/sh -c "id -u nginx >/dev/null 2>&1 || adduser --disabled-password --gecos '' nginx; chown -R nginx:nginx /home/root/.nginx || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec """ + healthcheck: + test: ["CMD", "sh", "-FRONT_CONFS_DIR/healthcheck_nginx.sh"] + interval: 30s + timeout: 10s + retries: 50 + restart: unless-stopped" + _4nk_vault: image: container_name: _4nk_vault working_dir: /_4nk_vault ports: - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_vault:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_vault - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_vault:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_vault @@ -187,10 +197,7 @@ services: container_name: tor working_dir: /tor ports: - - "0.0.0.0:" - "0.0.0.0:9050:9050" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/tor:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/tor - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/tor:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/tor @@ -247,10 +254,7 @@ services: container_name: blindbit_oracle working_dir: /blindbit_oracle ports: - - "0.0.0.0:" - "0.0.0.0:8000:8000" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/blindbit_oracle:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/blindbit_oracle - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/blindbit_oracle:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/blindbit_oracle @@ -277,10 +281,7 @@ services: container_name: sdk_relay working_dir: /sdk_relay ports: - - "0.0.0.0:" - "0.0.0.0:8080:8080" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_relay:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_relay - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_relay:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_relay @@ -307,10 +308,7 @@ services: container_name: sdk_storage working_dir: /sdk_storage ports: - - "0.0.0.0:" - "0.0.0.0:8081:8081" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_storage:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/sdk_storage - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_storage:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/sdk_storage @@ -337,10 +335,7 @@ services: container_name: ihm_client working_dir: /ihm_client ports: - - "0.0.0.0:" - "0.0.0.0:3003:3003" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ihm_client:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/ihm_client - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ihm_client:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/ihm_client @@ -367,10 +362,7 @@ services: container_name: _4nk_certificator working_dir: /_4nk_certificator ports: - - "0.0.0.0:" - "0.0.0.0:8082:8082" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_certificator:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_certificator - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_certificator:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_certificator @@ -397,10 +389,7 @@ services: container_name: _4nk_miner working_dir: /_4nk_miner ports: - - "0.0.0.0:" - "0.0.0.0:8083:8083" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_miner:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_miner - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_miner:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_miner @@ -427,10 +416,7 @@ services: container_name: lecoffre_front working_dir: /lecoffre_front ports: - - "0.0.0.0:" - "0.0.0.0:3000:3000" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/lecoffre_front:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/lecoffre_front - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/lecoffre_front:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/lecoffre_front @@ -459,8 +445,6 @@ services: ports: - "0.0.0.0:3006:3006" - "0.0.0.0:3006:3006" - - "0.0.0.0:" - - "0.0.0.0:" volumes: - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_web_status:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/_4nk_web_status - /home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_web_status:/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/_4nk_web_status diff --git a/templates/dev/.env b/templates/dev/.env index e8d5a42..a2cb52a 100644 --- a/templates/dev/.env +++ b/templates/dev/.env @@ -24,7 +24,7 @@ export SERVICES=( "LOKI" "PROMTAIL" "GRAFANA" - "NGNIX" + "NGINX" "TOR" "_4NK_VAULT" "BITCOIN" diff --git a/templates/dev/.env.auto b/templates/dev/.env.auto index 2f7750d..fc61f71 100644 --- a/templates/dev/.env.auto +++ b/templates/dev/.env.auto @@ -1,3 +1,6 @@ +# ====== BASE VARIABLES ====== +HOST=dev4._4NKweb.com + # ====== INTERNAL REDIS ====== REDIS_DOCKER_NAME=redis @@ -128,30 +131,30 @@ GRAFANA_URL_WS=ws://$GRAFANA_DOCKER_PORT GRAFANA_URL_WS_EXTERNAL=wss://$HOST/ws -# ====== INTERNAL NGNIX ====== +# ====== INTERNAL NGINX ====== -NGNIX_DOCKER_NAME=ngnix -NGNIX_CONFS_DIR=$DOCKER_GLOBAL/confs/ngnix -NGNIX_LOGS_DIR=$DOCKER_GLOBAL/logs/ngnix -NGNIX_RUNS_DIR=$DOCKER_GLOBAL/runs/ngnix -NGNIX_DATAS_DIR=$DOCKER_GLOBAL/datas/ngnix -NGNIX_BACKUPS_DIR=$DOCKER_GLOBAL/backups/ngnix -NGNIX_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/ngnix -NGNIX_DOCKER_WORKING_DIR=/home/ngnix +NGINX_DOCKER_NAME=nginx +NGINX_CONFS_DIR=$DOCKER_GLOBAL/confs/nginx +NGINX_LOGS_DIR=$DOCKER_GLOBAL/logs/nginx +NGINX_RUNS_DIR=$DOCKER_GLOBAL/runs/nginx +NGINX_DATAS_DIR=$DOCKER_GLOBAL/datas/nginx +NGINX_BACKUPS_DIR=$DOCKER_GLOBAL/backups/nginx +NGINX_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/nginx +NGINX_DOCKER_WORKING_DIR=/home/nginx -NGNIX_DOCKER_CONFS_DIR=$DOCKER_GLOBAL/confs/ngnix -NGNIX_DOCKER_LOGS_DIR=$DOCKER_GLOBAL/logs/ngnix -NGNIX_DOCKER_RUNS_DIR=$DOCKER_GLOBAL/runs/ngnix -NGNIX_DOCKER_DATAS_DIR=$DOCKER_GLOBAL/datas/ngnix -NGNIX_DOCKER_BACKUPS_DIR=$DOCKER_GLOBAL/backups/ngnix -NGNIX_DOCKER_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/ngnix -NGNIX_DOCKER_WORKING_DIR_CREATE="id -u $NGNIX >/dev/null 2>&1 || adduser --disabled-password --gecos '' $NGNIX; chown -R $NGNIX:$NGNIX /home/root/.$NGNIX || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec \"$@\"" -NGNIX_DOCKER_PORT=$NGNIX_PORT -NGNIX_URL_ROUTE=/ngnix -NGNIX_URL=http://$NGNIX_DOCKER_NAME:$NGNIX_DOCKER_PORT -NGNIX_URL_EXTERNAL=https://$HOST$NGNIX_URL_ROUTE -NGNIX_URL_WS=ws://$NGNIX_DOCKER_PORT -NGNIX_URL_WS_EXTERNAL=wss://$HOST/ws +NGINX_DOCKER_CONFS_DIR=$DOCKER_GLOBAL/confs/nginx +NGINX_DOCKER_LOGS_DIR=$DOCKER_GLOBAL/logs/nginx +NGINX_DOCKER_RUNS_DIR=$DOCKER_GLOBAL/runs/nginx +NGINX_DOCKER_DATAS_DIR=$DOCKER_GLOBAL/datas/nginx +NGINX_DOCKER_BACKUPS_DIR=$DOCKER_GLOBAL/backups/nginx +NGINX_DOCKER_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/nginx +NGINX_DOCKER_WORKING_DIR_CREATE="id -u $NGINX >/dev/null 2>&1 || adduser --disabled-password --gecos '' $NGINX; chown -R $NGINX:$NGINX /home/root/.$NGINX || echo 'warn: chown partiel (fichiers bind-mount Windows)'; exec \"$@\"" +NGINX_DOCKER_PORT=$NGINX_PORT +NGINX_URL_ROUTE=/nginx +NGINX_URL=http://$NGINX_DOCKER_NAME:$NGINX_DOCKER_PORT +NGINX_URL_EXTERNAL=https://$HOST$NGINX_URL_ROUTE +NGINX_URL_WS=ws://$NGINX_DOCKER_PORT +NGINX_URL_WS_EXTERNAL=wss://$HOST/ws # ====== INTERNAL TOR ====== diff --git a/templates/dev/_4NK_modules/grafana/dashboards/ngnix.json b/templates/dev/_4NK_modules/grafana/dashboards/nginx.json similarity index 93% rename from templates/dev/_4NK_modules/grafana/dashboards/ngnix.json rename to templates/dev/_4NK_modules/grafana/dashboards/nginx.json index 5e8b3ef..5e4d48c 100644 --- a/templates/dev/_4NK_modules/grafana/dashboards/ngnix.json +++ b/templates/dev/_4NK_modules/grafana/dashboards/nginx.json @@ -88,12 +88,12 @@ "uid": "loki" }, "editorMode": "code", - "expr": "sum(rate({container=\"$NGNIX_DOCKER_NAME\"} |= \"INFO\" [5m])) by (container)", + "expr": "sum(rate({container=\"$NGINX_DOCKER_NAME\"} |= \"INFO\" [5m])) by (container)", "queryType": "", "refId": "A" } ], - "title": "Logs INFO - ngnix", + "title": "Logs INFO - nginx", "type": "timeseries" }, { @@ -175,12 +175,12 @@ "uid": "loki" }, "editorMode": "code", - "expr": "sum(rate({container=\"$NGNIX_DOCKER_NAME\"} |= \"ERROR\" [5m])) by (container)", + "expr": "sum(rate({container=\"$NGINX_DOCKER_NAME\"} |= \"ERROR\" [5m])) by (container)", "queryType": "", "refId": "A" } ], - "title": "Erreurs - ngnix", + "title": "Erreurs - nginx", "type": "timeseries" }, { @@ -239,7 +239,7 @@ "uid": "loki" }, "editorMode": "code", - "expr": "count_over_time({container=\"$NGNIX_DOCKER_NAME\"} |= \"ERROR\" [1h])", + "expr": "count_over_time({container=\"$NGINX_DOCKER_NAME\"} |= \"ERROR\" [1h])", "queryType": "", "refId": "A" } @@ -276,12 +276,12 @@ "uid": "loki" }, "editorMode": "code", - "expr": "{container=\"$NGNIX_DOCKER_NAME\"} |= \"ERROR\" | line_format \"{{.timestamp}} - {{.message}}\"", + "expr": "{container=\"$NGINX_DOCKER_NAME\"} |= \"ERROR\" | line_format \"{{.timestamp}} - {{.message}}\"", "queryType": "", "refId": "A" } ], - "title": "Logs d'Erreur - ngnix", + "title": "Logs d'Erreur - nginx", "type": "logs" } ], @@ -289,7 +289,7 @@ "schemaVersion": 37, "style": "dark", "tags": [ - "ngnix", + "nginx", "auto-generated" ], "templating": { @@ -301,8 +301,8 @@ }, "timepicker": {}, "timezone": "", - "title": "ngnix - Monitoring", - "uid": "ngnix", + "title": "nginx - Monitoring", + "uid": "nginx", "version": 1, "weekStart": "" } diff --git a/templates/dev/_4NK_modules/nginx/BITCOIN_https.conf b/templates/dev/_4NK_modules/nginx/BITCOIN_https.conf index 28f1e60..98956aa 100644 --- a/templates/dev/_4NK_modules/nginx/BITCOIN_https.conf +++ b/templates/dev/_4NK_modules/nginx/BITCOIN_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour BITCOIN -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $BITCOIN.$_4NKweb.com; + server_name $BITCOIN.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$BITCOIN.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $BITCOIN_DOCKER_NAME.$_4NKweb.com; + server_name $BITCOIN.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$BITCOIN_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/BLINDBIT_ORACLE_https.conf b/templates/dev/_4NK_modules/nginx/BLINDBIT_ORACLE_https.conf index e197f00..2161158 100644 --- a/templates/dev/_4NK_modules/nginx/BLINDBIT_ORACLE_https.conf +++ b/templates/dev/_4NK_modules/nginx/BLINDBIT_ORACLE_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour BLINDBIT_ORACLE -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $BLINDBIT_ORACLE.$_4NKweb.com; + server_name $BLINDBIT_ORACLE.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$BLINDBIT_ORACLE.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $BLINDBIT_ORACLE_DOCKER_NAME.$_4NKweb.com; + server_name $BLINDBIT_ORACLE.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/GRAFANA_https.conf b/templates/dev/_4NK_modules/nginx/GRAFANA_https.conf index 36ece98..b53e512 100644 --- a/templates/dev/_4NK_modules/nginx/GRAFANA_https.conf +++ b/templates/dev/_4NK_modules/nginx/GRAFANA_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour GRAFANA -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $GRAFANA.$_4NKweb.com; + server_name $GRAFANA.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$GRAFANA.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $GRAFANA_DOCKER_NAME.$_4NKweb.com; + server_name $GRAFANA.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$GRAFANA_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/IHM_CLIENT_https.conf b/templates/dev/_4NK_modules/nginx/IHM_CLIENT_https.conf index e1cbede..decef80 100644 --- a/templates/dev/_4NK_modules/nginx/IHM_CLIENT_https.conf +++ b/templates/dev/_4NK_modules/nginx/IHM_CLIENT_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour IHM_CLIENT -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $IHM_CLIENT.$_4NKweb.com; + server_name $IHM_CLIENT.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$IHM_CLIENT.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $IHM_CLIENT_DOCKER_NAME.$_4NKweb.com; + server_name $IHM_CLIENT.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$IHM_CLIENT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/LECOFFRE_FRONT_https.conf b/templates/dev/_4NK_modules/nginx/LECOFFRE_FRONT_https.conf index b1a253e..62fb205 100644 --- a/templates/dev/_4NK_modules/nginx/LECOFFRE_FRONT_https.conf +++ b/templates/dev/_4NK_modules/nginx/LECOFFRE_FRONT_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour LECOFFRE_FRONT -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $LECOFFRE_FRONT.$_4NKweb.com; + server_name $LECOFFRE_FRONT.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$LECOFFRE_FRONT.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $LECOFFRE_FRONT_DOCKER_NAME.$_4NKweb.com; + server_name $LECOFFRE_FRONT.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/LOKI_https.conf b/templates/dev/_4NK_modules/nginx/LOKI_https.conf index ae3e5a6..86f7eb4 100644 --- a/templates/dev/_4NK_modules/nginx/LOKI_https.conf +++ b/templates/dev/_4NK_modules/nginx/LOKI_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour LOKI -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $LOKI.$_4NKweb.com; + server_name $LOKI.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$LOKI.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $LOKI_DOCKER_NAME.$_4NKweb.com; + server_name $LOKI.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$LOKI_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/NGNIX_https.conf b/templates/dev/_4NK_modules/nginx/NGINX_https.conf similarity index 50% rename from templates/dev/_4NK_modules/nginx/NGNIX_https.conf rename to templates/dev/_4NK_modules/nginx/NGINX_https.conf index 69754d1..ca218d2 100644 --- a/templates/dev/_4NK_modules/nginx/NGNIX_https.conf +++ b/templates/dev/_4NK_modules/nginx/NGINX_https.conf @@ -1,19 +1,19 @@ -# Configuration HTTPS pour NGNIX -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Configuration HTTPS pour NGINX +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $NGNIX.$_4NKweb.com; + server_name $NGINX.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$NGINX.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $NGNIX_DOCKER_NAME.$_4NKweb.com; + server_name $NGINX.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -25,19 +25,19 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; # HSTS (activer seulement si tout le domaine est en HTTPS) add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGNIX_https.log app_json; + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGINX_https.log app_json; location / { - proxy_pass http://$NGNIX_DOCKER_NAME; - include $/proxy_headers.conf; + proxy_pass http://$NGINX_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { - proxy_pass http://$NGNIX_DOCKER_NAME; + proxy_pass http://$NGINX_DOCKER_NAME; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/POSTGRESQL_https.conf b/templates/dev/_4NK_modules/nginx/POSTGRESQL_https.conf index 7245d21..24d825b 100644 --- a/templates/dev/_4NK_modules/nginx/POSTGRESQL_https.conf +++ b/templates/dev/_4NK_modules/nginx/POSTGRESQL_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour POSTGRESQL -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $POSTGRESQL.$_4NKweb.com; + server_name $POSTGRESQL.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$POSTGRESQL.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $POSTGRESQL_DOCKER_NAME.$_4NKweb.com; + server_name $POSTGRESQL.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$POSTGRESQL_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/PROMTAIL_https.conf b/templates/dev/_4NK_modules/nginx/PROMTAIL_https.conf index 9d3602b..c8bf948 100644 --- a/templates/dev/_4NK_modules/nginx/PROMTAIL_https.conf +++ b/templates/dev/_4NK_modules/nginx/PROMTAIL_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour PROMTAIL -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $PROMTAIL.$_4NKweb.com; + server_name $PROMTAIL.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$PROMTAIL.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $PROMTAIL_DOCKER_NAME.$_4NKweb.com; + server_name $PROMTAIL.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$PROMTAIL_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/REDIS_https.conf b/templates/dev/_4NK_modules/nginx/REDIS_https.conf index 7c9a6da..90c503f 100644 --- a/templates/dev/_4NK_modules/nginx/REDIS_https.conf +++ b/templates/dev/_4NK_modules/nginx/REDIS_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour REDIS -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $REDIS.$_4NKweb.com; + server_name $REDIS.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$REDIS.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $REDIS_DOCKER_NAME.$_4NKweb.com; + server_name $REDIS.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$REDIS_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/SDK_RELAY_https.conf b/templates/dev/_4NK_modules/nginx/SDK_RELAY_https.conf index bb212aa..432c25c 100644 --- a/templates/dev/_4NK_modules/nginx/SDK_RELAY_https.conf +++ b/templates/dev/_4NK_modules/nginx/SDK_RELAY_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour SDK_RELAY -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $SDK_RELAY.$_4NKweb.com; + server_name $SDK_RELAY.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$SDK_RELAY.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $SDK_RELAY_DOCKER_NAME.$_4NKweb.com; + server_name $SDK_RELAY.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$SDK_RELAY_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/SDK_STORAGE_https.conf b/templates/dev/_4NK_modules/nginx/SDK_STORAGE_https.conf index 6f48670..706355a 100644 --- a/templates/dev/_4NK_modules/nginx/SDK_STORAGE_https.conf +++ b/templates/dev/_4NK_modules/nginx/SDK_STORAGE_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour SDK_STORAGE -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $SDK_STORAGE.$_4NKweb.com; + server_name $SDK_STORAGE.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$SDK_STORAGE.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $SDK_STORAGE_DOCKER_NAME.$_4NKweb.com; + server_name $SDK_STORAGE.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$SDK_STORAGE_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/TOR_https.conf b/templates/dev/_4NK_modules/nginx/TOR_https.conf index 11d24d2..c429635 100644 --- a/templates/dev/_4NK_modules/nginx/TOR_https.conf +++ b/templates/dev/_4NK_modules/nginx/TOR_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour TOR -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $TOR.$_4NKweb.com; + server_name $TOR.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$TOR.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $TOR_DOCKER_NAME.$_4NKweb.com; + server_name $TOR.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$TOR_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/_4NK_CERTIFICATOR_https.conf b/templates/dev/_4NK_modules/nginx/_4NK_CERTIFICATOR_https.conf index 6b6781e..9765f9f 100644 --- a/templates/dev/_4NK_modules/nginx/_4NK_CERTIFICATOR_https.conf +++ b/templates/dev/_4NK_modules/nginx/_4NK_CERTIFICATOR_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour _4NK_CERTIFICATOR -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $_4NK_CERTIFICATOR.$_4NKweb.com; + server_name $_4NK_CERTIFICATOR.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$_4NK_CERTIFICATOR.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $_4NK_CERTIFICATOR_DOCKER_NAME.$_4NKweb.com; + server_name $_4NK_CERTIFICATOR.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/_4NK_MINER_https.conf b/templates/dev/_4NK_modules/nginx/_4NK_MINER_https.conf index 690dfc8..f1159e3 100644 --- a/templates/dev/_4NK_modules/nginx/_4NK_MINER_https.conf +++ b/templates/dev/_4NK_modules/nginx/_4NK_MINER_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour _4NK_MINER -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $_4NK_MINER.$_4NKweb.com; + server_name $_4NK_MINER.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$_4NK_MINER.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $_4NK_MINER_DOCKER_NAME.$_4NKweb.com; + server_name $_4NK_MINER.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$_4NK_MINER_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/_4NK_VAULT_https.conf b/templates/dev/_4NK_modules/nginx/_4NK_VAULT_https.conf index 84739e6..fb4ca83 100644 --- a/templates/dev/_4NK_modules/nginx/_4NK_VAULT_https.conf +++ b/templates/dev/_4NK_modules/nginx/_4NK_VAULT_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour _4NK_VAULT -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:48 UTC 2025 server { listen 80; - server_name $_4NK_VAULT.$_4NKweb.com; + server_name $_4NK_VAULT.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$_4NK_VAULT.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $_4NK_VAULT_DOCKER_NAME.$_4NKweb.com; + server_name $_4NK_VAULT.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$_4NK_VAULT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/_4NK_WEB_STATUS_https.conf b/templates/dev/_4NK_modules/nginx/_4NK_WEB_STATUS_https.conf index 41f7561..09a3798 100644 --- a/templates/dev/_4NK_modules/nginx/_4NK_WEB_STATUS_https.conf +++ b/templates/dev/_4NK_modules/nginx/_4NK_WEB_STATUS_https.conf @@ -1,19 +1,19 @@ # Configuration HTTPS pour _4NK_WEB_STATUS -# Généré automatiquement le Sun Oct 5 22:28:54 UTC 2025 +# Généré automatiquement le Sun Oct 5 22:53:49 UTC 2025 server { listen 80; - server_name $_4NK_WEB_STATUS.$_4NKweb.com; + server_name $_4NK_WEB_STATUS.$dev4._4NKweb.com; # redirection HTTP→HTTPS pour l'externe - return 301 https://$host$request_uri; + return 301 https://$_4NK_WEB_STATUS.$dev4._4NKweb.com$request_uri; } server { listen 443 ssl http2; - server_name $_4NK_WEB_STATUS_DOCKER_NAME.$_4NKweb.com; + server_name $_4NK_WEB_STATUS.$dev4._4NKweb.com; -ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dev4._4NKweb.com/privkey.pem; +ssl_certificate /etc/letsencrypt/live/$dev4._4NKweb.com/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/$dev4._4NKweb.com/privkey.pem; # réglages TLS minimaux (adapter selon politique) @@ -29,7 +29,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; location / { proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -37,7 +37,7 @@ ssl_certificate /etc/letsencrypt/live/dev4._4NKweb.com/fullchain.pem; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/app-internal-ports.conf b/templates/dev/_4NK_modules/nginx/app-internal-ports.conf index 3fbc997..25059bd 100644 --- a/templates/dev/_4NK_modules/nginx/app-internal-ports.conf +++ b/templates/dev/_4NK_modules/nginx/app-internal-ports.conf @@ -9,7 +9,7 @@ server { location / { proxy_pass http://$REDIS_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -18,7 +18,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $REDIS_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$REDIS_ext.log app_json; + + location / { + proxy_pass http://$REDIS_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$REDIS_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $REDIS_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$REDIS_port2.log app_json; + + location / { + proxy_pass http://$REDIS_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$REDIS_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $REDIS_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$REDIS_port3.log app_json; + + location / { + proxy_pass http://$REDIS_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$REDIS_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -30,7 +93,7 @@ server { location / { proxy_pass http://$POSTGRESQL_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -39,7 +102,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $POSTGRESQL_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$POSTGRESQL_ext.log app_json; + + location / { + proxy_pass http://$POSTGRESQL_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$POSTGRESQL_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $POSTGRESQL_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$POSTGRESQL_port2.log app_json; + + location / { + proxy_pass http://$POSTGRESQL_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$POSTGRESQL_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $POSTGRESQL_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$POSTGRESQL_port3.log app_json; + + location / { + proxy_pass http://$POSTGRESQL_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$POSTGRESQL_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -51,7 +177,7 @@ server { location / { proxy_pass http://$LOKI_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -60,7 +186,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $LOKI_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$LOKI_ext.log app_json; + + location / { + proxy_pass http://$LOKI_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$LOKI_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $LOKI_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$LOKI_port2.log app_json; + + location / { + proxy_pass http://$LOKI_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$LOKI_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $LOKI_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$LOKI_port3.log app_json; + + location / { + proxy_pass http://$LOKI_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$LOKI_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -72,7 +261,7 @@ server { location / { proxy_pass http://$PROMTAIL_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -81,7 +270,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $PROMTAIL_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$PROMTAIL_ext.log app_json; + + location / { + proxy_pass http://$PROMTAIL_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$PROMTAIL_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $PROMTAIL_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$PROMTAIL_port2.log app_json; + + location / { + proxy_pass http://$PROMTAIL_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$PROMTAIL_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $PROMTAIL_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$PROMTAIL_port3.log app_json; + + location / { + proxy_pass http://$PROMTAIL_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$PROMTAIL_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -93,7 +345,7 @@ server { location / { proxy_pass http://$GRAFANA_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -102,28 +354,154 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } server { - listen $NGNIX_PORT default_server; + listen $GRAFANA_EXTERNAL_PORT default_server; server_name _; # pas d'host requis - access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGNIX_int.log app_json; + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$GRAFANA_ext.log app_json; location / { - proxy_pass http://$NGNIX_DOCKER_NAME; - include $/proxy_headers.conf; + proxy_pass http://$GRAFANA_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) location /ws/ { - proxy_pass http://$NGNIX_DOCKER_NAME; + proxy_pass http://$GRAFANA_DOCKER_NAME; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $GRAFANA_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$GRAFANA_port2.log app_json; + + location / { + proxy_pass http://$GRAFANA_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$GRAFANA_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $GRAFANA_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$GRAFANA_port3.log app_json; + + location / { + proxy_pass http://$GRAFANA_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$GRAFANA_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $NGINX_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGINX_int.log app_json; + + location / { + proxy_pass http://$NGINX_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$NGINX_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $NGINX_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGINX_ext.log app_json; + + location / { + proxy_pass http://$NGINX_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$NGINX_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $NGINX_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGINX_port2.log app_json; + + location / { + proxy_pass http://$NGINX_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$NGINX_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $NGINX_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGINX_port3.log app_json; + + location / { + proxy_pass http://$NGINX_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$NGINX_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -135,7 +513,7 @@ server { location / { proxy_pass http://$TOR_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -144,7 +522,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $TOR_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$TOR_ext.log app_json; + + location / { + proxy_pass http://$TOR_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$TOR_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $TOR_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$TOR_port2.log app_json; + + location / { + proxy_pass http://$TOR_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$TOR_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $TOR_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$TOR_port3.log app_json; + + location / { + proxy_pass http://$TOR_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$TOR_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -156,7 +597,7 @@ server { location / { proxy_pass http://$_4NK_VAULT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -165,7 +606,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_VAULT_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_VAULT_ext.log app_json; + + location / { + proxy_pass http://$_4NK_VAULT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_VAULT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_VAULT_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_VAULT_port2.log app_json; + + location / { + proxy_pass http://$_4NK_VAULT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_VAULT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_VAULT_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_VAULT_port3.log app_json; + + location / { + proxy_pass http://$_4NK_VAULT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_VAULT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -177,7 +681,7 @@ server { location / { proxy_pass http://$BITCOIN_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -186,11 +690,96 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } +server { + listen $BITCOIN_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BITCOIN_ext.log app_json; + + location / { + proxy_pass http://$BITCOIN_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$BITCOIN_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $BITCOIN_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BITCOIN_port2.log app_json; + + location / { + proxy_pass http://$BITCOIN_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$BITCOIN_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $BITCOIN_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BITCOIN_port3.log app_json; + + location / { + proxy_pass http://$BITCOIN_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$BITCOIN_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $BITCOIN_SIGNET_P2P_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BITCOIN_p2p.log app_json; + + location / { + proxy_pass http://$BITCOIN_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } +} + +server { + listen $BITCOIN_SIGNET_RPC_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BITCOIN_rpc.log app_json; + + location / { + proxy_pass http://$BITCOIN_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } +} + server { listen $BLINDBIT_ORACLE_PORT default_server; server_name _; # pas d'host requis @@ -198,7 +787,7 @@ server { location / { proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -207,7 +796,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $BLINDBIT_ORACLE_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BLINDBIT_ORACLE_ext.log app_json; + + location / { + proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $BLINDBIT_ORACLE_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BLINDBIT_ORACLE_port2.log app_json; + + location / { + proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $BLINDBIT_ORACLE_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$BLINDBIT_ORACLE_port3.log app_json; + + location / { + proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -219,7 +871,7 @@ server { location / { proxy_pass http://$SDK_RELAY_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -228,7 +880,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $SDK_RELAY_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$SDK_RELAY_ext.log app_json; + + location / { + proxy_pass http://$SDK_RELAY_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$SDK_RELAY_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $SDK_RELAY_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$SDK_RELAY_port2.log app_json; + + location / { + proxy_pass http://$SDK_RELAY_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$SDK_RELAY_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $SDK_RELAY_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$SDK_RELAY_port3.log app_json; + + location / { + proxy_pass http://$SDK_RELAY_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$SDK_RELAY_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -240,7 +955,7 @@ server { location / { proxy_pass http://$SDK_STORAGE_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -249,7 +964,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $SDK_STORAGE_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$SDK_STORAGE_ext.log app_json; + + location / { + proxy_pass http://$SDK_STORAGE_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$SDK_STORAGE_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $SDK_STORAGE_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$SDK_STORAGE_port2.log app_json; + + location / { + proxy_pass http://$SDK_STORAGE_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$SDK_STORAGE_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $SDK_STORAGE_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$SDK_STORAGE_port3.log app_json; + + location / { + proxy_pass http://$SDK_STORAGE_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$SDK_STORAGE_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -261,7 +1039,7 @@ server { location / { proxy_pass http://$IHM_CLIENT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -270,7 +1048,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $IHM_CLIENT_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$IHM_CLIENT_ext.log app_json; + + location / { + proxy_pass http://$IHM_CLIENT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$IHM_CLIENT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $IHM_CLIENT_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$IHM_CLIENT_port2.log app_json; + + location / { + proxy_pass http://$IHM_CLIENT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$IHM_CLIENT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $IHM_CLIENT_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$IHM_CLIENT_port3.log app_json; + + location / { + proxy_pass http://$IHM_CLIENT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$IHM_CLIENT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -282,7 +1123,7 @@ server { location / { proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -291,7 +1132,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_CERTIFICATOR_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_CERTIFICATOR_ext.log app_json; + + location / { + proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_CERTIFICATOR_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_CERTIFICATOR_port2.log app_json; + + location / { + proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_CERTIFICATOR_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_CERTIFICATOR_port3.log app_json; + + location / { + proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -303,7 +1207,7 @@ server { location / { proxy_pass http://$_4NK_MINER_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -312,7 +1216,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_MINER_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_MINER_ext.log app_json; + + location / { + proxy_pass http://$_4NK_MINER_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_MINER_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_MINER_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_MINER_port2.log app_json; + + location / { + proxy_pass http://$_4NK_MINER_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_MINER_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_MINER_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_MINER_port3.log app_json; + + location / { + proxy_pass http://$_4NK_MINER_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_MINER_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -324,7 +1291,7 @@ server { location / { proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -333,7 +1300,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $LECOFFRE_FRONT_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$LECOFFRE_FRONT_ext.log app_json; + + location / { + proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $LECOFFRE_FRONT_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$LECOFFRE_FRONT_port2.log app_json; + + location / { + proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $LECOFFRE_FRONT_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$LECOFFRE_FRONT_port3.log app_json; + + location / { + proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -345,7 +1375,7 @@ server { location / { proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } # websocket (si nécessaire) @@ -354,7 +1384,70 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_WEB_STATUS_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_WEB_STATUS_ext.log app_json; + + location / { + proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_WEB_STATUS_PORT2 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_WEB_STATUS_port2.log app_json; + + location / { + proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} + +server { + listen $_4NK_WEB_STATUS_PORT3 default_server; + server_name _; # pas d'host requis + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$_4NK_WEB_STATUS_port3.log app_json; + + location / { + proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/nginx_dev4._4NKweb.com-https.conf b/templates/dev/_4NK_modules/nginx/nginx_dev4._4NKweb.com-https.conf index 7ce3832..58629ef 100644 --- a/templates/dev/_4NK_modules/nginx/nginx_dev4._4NKweb.com-https.conf +++ b/templates/dev/_4NK_modules/nginx/nginx_dev4._4NKweb.com-https.conf @@ -41,7 +41,7 @@ server { location / { proxy_pass http://$REDIS_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -49,7 +49,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -82,7 +82,7 @@ server { location / { proxy_pass http://$POSTGRESQL_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -90,7 +90,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -123,7 +123,7 @@ server { location / { proxy_pass http://$LOKI_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -131,7 +131,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -164,7 +164,7 @@ server { location / { proxy_pass http://$PROMTAIL_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -172,7 +172,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -205,7 +205,7 @@ server { location / { proxy_pass http://$GRAFANA_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -213,22 +213,22 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } -# Configuration HTTPS pour NGNIX +# Configuration HTTPS pour NGINX server { listen 80; - server_name $NGNIX.$_4NKweb.com; + server_name $NGINX.$_4NKweb.com; # redirection HTTP→HTTPS pour l'externe return 301 https://$host$request_uri; } server { listen 443 ssl http2; - server_name $NGNIX_DOCKER_NAME.$_4NKweb.com; + server_name $NGINX_DOCKER_NAME.$_4NKweb.com; ssl_certificate $/etc/letsencrypt/live/dev4._4NKweb.com/certs/fullchain.pem; ssl_certificate_key $/etc/letsencrypt/live/dev4._4NKweb.com/private/privkey.pem; @@ -242,19 +242,19 @@ server { # HSTS (activer seulement si tout le domaine est en HTTPS) add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGNIX_https.log app_json; + access_log $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/logs/nginx/$NGINX_https.log app_json; location / { - proxy_pass http://$NGNIX_DOCKER_NAME; - include $/proxy_headers.conf; + proxy_pass http://$NGINX_DOCKER_NAME; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { - proxy_pass http://$NGNIX_DOCKER_NAME; + proxy_pass http://$NGINX_DOCKER_NAME; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -287,7 +287,7 @@ server { location / { proxy_pass http://$TOR_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -295,7 +295,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -328,7 +328,7 @@ server { location / { proxy_pass http://$_4NK_VAULT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -336,7 +336,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -369,7 +369,7 @@ server { location / { proxy_pass http://$BITCOIN_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -377,7 +377,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -410,7 +410,7 @@ server { location / { proxy_pass http://$BLINDBIT_ORACLE_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -418,7 +418,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -451,7 +451,7 @@ server { location / { proxy_pass http://$SDK_RELAY_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -459,7 +459,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -492,7 +492,7 @@ server { location / { proxy_pass http://$SDK_STORAGE_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -500,7 +500,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -533,7 +533,7 @@ server { location / { proxy_pass http://$IHM_CLIENT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -541,7 +541,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -574,7 +574,7 @@ server { location / { proxy_pass http://$_4NK_CERTIFICATOR_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -582,7 +582,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -615,7 +615,7 @@ server { location / { proxy_pass http://$_4NK_MINER_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -623,7 +623,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -656,7 +656,7 @@ server { location / { proxy_pass http://$LECOFFRE_FRONT_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -664,7 +664,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } @@ -697,7 +697,7 @@ server { location / { proxy_pass http://$_4NK_WEB_STATUS_DOCKER_NAME; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; } location /ws/ { @@ -705,7 +705,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - include $/proxy_headers.conf; + include $/home/debian/_4NK_env/projects/lecoffre/lecoffre_node/confs/nginx/proxy_headers.conf; proxy_read_timeout 3600s; } } diff --git a/templates/dev/_4NK_modules/nginx/upstreams.conf b/templates/dev/_4NK_modules/nginx/upstreams.conf index 70ea138..97333eb 100644 --- a/templates/dev/_4NK_modules/nginx/upstreams.conf +++ b/templates/dev/_4NK_modules/nginx/upstreams.conf @@ -21,28 +21,118 @@ upstream $REDIS { keepalive 64; } +upstream $REDIS_EXTERNAL { + server $REDIS_DOCKER_NAME:$REDIS_EXTERNAL_PORT; + keepalive 64; +} + +upstream $REDIS_PORT2 { + server $REDIS_DOCKER_NAME:$REDIS_PORT2; + keepalive 64; +} + +upstream $REDIS_PORT3 { + server $REDIS_DOCKER_NAME:$REDIS_PORT3; + keepalive 64; +} + upstream $POSTGRESQL { server $POSTGRESQL_DOCKER_NAME:$POSTGRESQL_PORT; keepalive 64; } +upstream $POSTGRESQL_EXTERNAL { + server $POSTGRESQL_DOCKER_NAME:$POSTGRESQL_EXTERNAL_PORT; + keepalive 64; +} + +upstream $POSTGRESQL_PORT2 { + server $POSTGRESQL_DOCKER_NAME:$POSTGRESQL_PORT2; + keepalive 64; +} + +upstream $POSTGRESQL_PORT3 { + server $POSTGRESQL_DOCKER_NAME:$POSTGRESQL_PORT3; + keepalive 64; +} + upstream $LOKI { server $LOKI_DOCKER_NAME:$LOKI_PORT; keepalive 64; } +upstream $LOKI_EXTERNAL { + server $LOKI_DOCKER_NAME:$LOKI_EXTERNAL_PORT; + keepalive 64; +} + +upstream $LOKI_PORT2 { + server $LOKI_DOCKER_NAME:$LOKI_PORT2; + keepalive 64; +} + +upstream $LOKI_PORT3 { + server $LOKI_DOCKER_NAME:$LOKI_PORT3; + keepalive 64; +} + upstream $PROMTAIL { server $PROMTAIL_DOCKER_NAME:$PROMTAIL_PORT; keepalive 64; } +upstream $PROMTAIL_EXTERNAL { + server $PROMTAIL_DOCKER_NAME:$PROMTAIL_EXTERNAL_PORT; + keepalive 64; +} + +upstream $PROMTAIL_PORT2 { + server $PROMTAIL_DOCKER_NAME:$PROMTAIL_PORT2; + keepalive 64; +} + +upstream $PROMTAIL_PORT3 { + server $PROMTAIL_DOCKER_NAME:$PROMTAIL_PORT3; + keepalive 64; +} + upstream $GRAFANA { server $GRAFANA_DOCKER_NAME:$GRAFANA_PORT; keepalive 64; } -upstream $NGNIX { - server $NGNIX_DOCKER_NAME:$NGNIX_PORT; +upstream $GRAFANA_EXTERNAL { + server $GRAFANA_DOCKER_NAME:$GRAFANA_EXTERNAL_PORT; + keepalive 64; +} + +upstream $GRAFANA_PORT2 { + server $GRAFANA_DOCKER_NAME:$GRAFANA_PORT2; + keepalive 64; +} + +upstream $GRAFANA_PORT3 { + server $GRAFANA_DOCKER_NAME:$GRAFANA_PORT3; + keepalive 64; +} + +upstream $NGINX { + server $NGINX_DOCKER_NAME:$NGINX_PORT; + keepalive 64; +} + +upstream $NGINX_EXTERNAL { + server $NGINX_DOCKER_NAME:$NGINX_EXTERNAL_PORT; + keepalive 64; +} + +upstream $NGINX_PORT2 { + server $NGINX_DOCKER_NAME:$NGINX_PORT2; + keepalive 64; +} + +upstream $NGINX_PORT3 { + server $NGINX_DOCKER_NAME:$NGINX_PORT3; keepalive 64; } @@ -51,52 +141,227 @@ upstream $TOR { keepalive 64; } +upstream $TOR_EXTERNAL { + server $TOR_DOCKER_NAME:$TOR_EXTERNAL_PORT; + keepalive 64; +} + +upstream $TOR_PORT2 { + server $TOR_DOCKER_NAME:$TOR_PORT2; + keepalive 64; +} + +upstream $TOR_PORT3 { + server $TOR_DOCKER_NAME:$TOR_PORT3; + keepalive 64; +} + upstream $_4NK_VAULT { server $_4NK_VAULT_DOCKER_NAME:$_4NK_VAULT_PORT; keepalive 64; } +upstream $_4NK_VAULT_EXTERNAL { + server $_4NK_VAULT_DOCKER_NAME:$_4NK_VAULT_EXTERNAL_PORT; + keepalive 64; +} + +upstream $_4NK_VAULT_PORT2 { + server $_4NK_VAULT_DOCKER_NAME:$_4NK_VAULT_PORT2; + keepalive 64; +} + +upstream $_4NK_VAULT_PORT3 { + server $_4NK_VAULT_DOCKER_NAME:$_4NK_VAULT_PORT3; + keepalive 64; +} + upstream $BITCOIN { server $BITCOIN_DOCKER_NAME:$BITCOIN_PORT; keepalive 64; } +upstream $BITCOIN_EXTERNAL { + server $BITCOIN_DOCKER_NAME:$BITCOIN_EXTERNAL_PORT; + keepalive 64; +} + +upstream $BITCOIN_PORT2 { + server $BITCOIN_DOCKER_NAME:$BITCOIN_PORT2; + keepalive 64; +} + +upstream $BITCOIN_PORT3 { + server $BITCOIN_DOCKER_NAME:$BITCOIN_PORT3; + keepalive 64; +} + +upstream $BITCOIN_P2P { + server $BITCOIN_DOCKER_NAME:$BITCOIN_SIGNET_P2P_PORT; + keepalive 64; +} + +upstream $BITCOIN_RPC { + server $BITCOIN_DOCKER_NAME:$BITCOIN_SIGNET_RPC_PORT; + keepalive 64; +} + upstream $BLINDBIT_ORACLE { server $BLINDBIT_ORACLE_DOCKER_NAME:$BLINDBIT_ORACLE_PORT; keepalive 64; } +upstream $BLINDBIT_ORACLE_EXTERNAL { + server $BLINDBIT_ORACLE_DOCKER_NAME:$BLINDBIT_ORACLE_EXTERNAL_PORT; + keepalive 64; +} + +upstream $BLINDBIT_ORACLE_PORT2 { + server $BLINDBIT_ORACLE_DOCKER_NAME:$BLINDBIT_ORACLE_PORT2; + keepalive 64; +} + +upstream $BLINDBIT_ORACLE_PORT3 { + server $BLINDBIT_ORACLE_DOCKER_NAME:$BLINDBIT_ORACLE_PORT3; + keepalive 64; +} + upstream $SDK_RELAY { server $SDK_RELAY_DOCKER_NAME:$SDK_RELAY_PORT; keepalive 64; } +upstream $SDK_RELAY_EXTERNAL { + server $SDK_RELAY_DOCKER_NAME:$SDK_RELAY_EXTERNAL_PORT; + keepalive 64; +} + +upstream $SDK_RELAY_PORT2 { + server $SDK_RELAY_DOCKER_NAME:$SDK_RELAY_PORT2; + keepalive 64; +} + +upstream $SDK_RELAY_PORT3 { + server $SDK_RELAY_DOCKER_NAME:$SDK_RELAY_PORT3; + keepalive 64; +} + upstream $SDK_STORAGE { server $SDK_STORAGE_DOCKER_NAME:$SDK_STORAGE_PORT; keepalive 64; } +upstream $SDK_STORAGE_EXTERNAL { + server $SDK_STORAGE_DOCKER_NAME:$SDK_STORAGE_EXTERNAL_PORT; + keepalive 64; +} + +upstream $SDK_STORAGE_PORT2 { + server $SDK_STORAGE_DOCKER_NAME:$SDK_STORAGE_PORT2; + keepalive 64; +} + +upstream $SDK_STORAGE_PORT3 { + server $SDK_STORAGE_DOCKER_NAME:$SDK_STORAGE_PORT3; + keepalive 64; +} + upstream $IHM_CLIENT { server $IHM_CLIENT_DOCKER_NAME:$IHM_CLIENT_PORT; keepalive 64; } +upstream $IHM_CLIENT_EXTERNAL { + server $IHM_CLIENT_DOCKER_NAME:$IHM_CLIENT_EXTERNAL_PORT; + keepalive 64; +} + +upstream $IHM_CLIENT_PORT2 { + server $IHM_CLIENT_DOCKER_NAME:$IHM_CLIENT_PORT2; + keepalive 64; +} + +upstream $IHM_CLIENT_PORT3 { + server $IHM_CLIENT_DOCKER_NAME:$IHM_CLIENT_PORT3; + keepalive 64; +} + upstream $_4NK_CERTIFICATOR { server $_4NK_CERTIFICATOR_DOCKER_NAME:$_4NK_CERTIFICATOR_PORT; keepalive 64; } +upstream $_4NK_CERTIFICATOR_EXTERNAL { + server $_4NK_CERTIFICATOR_DOCKER_NAME:$_4NK_CERTIFICATOR_EXTERNAL_PORT; + keepalive 64; +} + +upstream $_4NK_CERTIFICATOR_PORT2 { + server $_4NK_CERTIFICATOR_DOCKER_NAME:$_4NK_CERTIFICATOR_PORT2; + keepalive 64; +} + +upstream $_4NK_CERTIFICATOR_PORT3 { + server $_4NK_CERTIFICATOR_DOCKER_NAME:$_4NK_CERTIFICATOR_PORT3; + keepalive 64; +} + upstream $_4NK_MINER { server $_4NK_MINER_DOCKER_NAME:$_4NK_MINER_PORT; keepalive 64; } +upstream $_4NK_MINER_EXTERNAL { + server $_4NK_MINER_DOCKER_NAME:$_4NK_MINER_EXTERNAL_PORT; + keepalive 64; +} + +upstream $_4NK_MINER_PORT2 { + server $_4NK_MINER_DOCKER_NAME:$_4NK_MINER_PORT2; + keepalive 64; +} + +upstream $_4NK_MINER_PORT3 { + server $_4NK_MINER_DOCKER_NAME:$_4NK_MINER_PORT3; + keepalive 64; +} + upstream $LECOFFRE_FRONT { server $LECOFFRE_FRONT_DOCKER_NAME:$LECOFFRE_FRONT_PORT; keepalive 64; } +upstream $LECOFFRE_FRONT_EXTERNAL { + server $LECOFFRE_FRONT_DOCKER_NAME:$LECOFFRE_FRONT_EXTERNAL_PORT; + keepalive 64; +} + +upstream $LECOFFRE_FRONT_PORT2 { + server $LECOFFRE_FRONT_DOCKER_NAME:$LECOFFRE_FRONT_PORT2; + keepalive 64; +} + +upstream $LECOFFRE_FRONT_PORT3 { + server $LECOFFRE_FRONT_DOCKER_NAME:$LECOFFRE_FRONT_PORT3; + keepalive 64; +} + upstream $_4NK_WEB_STATUS { server $_4NK_WEB_STATUS_DOCKER_NAME:$_4NK_WEB_STATUS_PORT; keepalive 64; } + +upstream $_4NK_WEB_STATUS_EXTERNAL { + server $_4NK_WEB_STATUS_DOCKER_NAME:$_4NK_WEB_STATUS_EXTERNAL_PORT; + keepalive 64; +} + +upstream $_4NK_WEB_STATUS_PORT2 { + server $_4NK_WEB_STATUS_DOCKER_NAME:$_4NK_WEB_STATUS_PORT2; + keepalive 64; +} + +upstream $_4NK_WEB_STATUS_PORT3 { + server $_4NK_WEB_STATUS_DOCKER_NAME:$_4NK_WEB_STATUS_PORT3; + keepalive 64; +} diff --git a/templates/dev/_4NK_modules/promtail/promtail.yml b/templates/dev/_4NK_modules/promtail/promtail.yml index 5377b26..8c08a20 100644 --- a/templates/dev/_4NK_modules/promtail/promtail.yml +++ b/templates/dev/_4NK_modules/promtail/promtail.yml @@ -105,16 +105,16 @@ scrape_configs: source: timestamp format: '2006-01-02 15:04:05' - - job_name: 'NGNIX' + - job_name: 'NGINX' static_configs: - targets: - localhost labels: - job: NGNIX - __path__: $NGNIX_LOGS_DIR/*.log + job: NGINX + __path__: $NGINX_LOGS_DIR/*.log pipeline_stages: - match: - selector: '{job="NGNIX"}' + selector: '{job="NGINX"}' stages: - regex: expression: '^(?P\S+\s\S+)\s+(?P\S+)\s+(?P.*)' diff --git a/templates/dev/docker-compose.yml.auto b/templates/dev/docker-compose.yml.auto index 2b220e6..1f9d186 100644 --- a/templates/dev/docker-compose.yml.auto +++ b/templates/dev/docker-compose.yml.auto @@ -1,16 +1,15 @@ services: - $REDIS_DOCKER_NAME: image: $REDIS_DOCKER_IMAGE container_name: $REDIS_DOCKER_NAME working_dir: /$REDIS_DOCKER_NAME ports: - - "0.0.0.0:$REDIS_EXTERNAL_PORT" - - "0.0.0.0:$REDIS_PORT" - - "0.0.0.0:$REDIS_PORT2" - - "0.0.0.0:$REDIS_PORT3" + - "$REDIS_EXTERNAL_PORT:$REDIS_EXTERNAL_PORT" + - "$REDIS_PORT:$REDIS_PORT" + - "$REDIS_PORT2:$REDIS_PORT2" + - "$REDIS_PORT3:$REDIS_PORT3" volumes: - $REDIS_CONFS_DIR:$REDIS_DOCKER_CONFS_DIR - $REDIS_LOGS_DIR:$REDIS_DOCKER_LOGS_DIR @@ -24,23 +23,22 @@ services: - $REDIS_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$REDIS_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$REDIS_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$REDIS.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$REDIS.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $POSTGRESQL_DOCKER_NAME: image: $POSTGRESQL_DOCKER_IMAGE container_name: $POSTGRESQL_DOCKER_NAME working_dir: /$POSTGRESQL_DOCKER_NAME ports: - - "0.0.0.0:$POSTGRESQL_EXTERNAL_PORT" - - "0.0.0.0:$POSTGRESQL_PORT" - - "0.0.0.0:$POSTGRESQL_PORT2" - - "0.0.0.0:$POSTGRESQL_PORT3" + - "$POSTGRESQL_EXTERNAL_PORT:$POSTGRESQL_EXTERNAL_PORT" + - "$POSTGRESQL_PORT:$POSTGRESQL_PORT" + - "$POSTGRESQL_PORT2:$POSTGRESQL_PORT2" + - "$POSTGRESQL_PORT3:$POSTGRESQL_PORT3" volumes: - $POSTGRESQL_CONFS_DIR:$POSTGRESQL_DOCKER_CONFS_DIR - $POSTGRESQL_LOGS_DIR:$POSTGRESQL_DOCKER_LOGS_DIR @@ -54,23 +52,22 @@ services: - $POSTGRESQL_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$POSTGRESQL_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$POSTGRESQL_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$POSTGRESQL.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$POSTGRESQL.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $LOKI_DOCKER_NAME: image: $LOKI_DOCKER_IMAGE container_name: $LOKI_DOCKER_NAME working_dir: /$LOKI_DOCKER_NAME ports: - - "0.0.0.0:$LOKI_EXTERNAL_PORT" - - "0.0.0.0:$LOKI_PORT" - - "0.0.0.0:$LOKI_PORT2" - - "0.0.0.0:$LOKI_PORT3" + - "$LOKI_EXTERNAL_PORT:$LOKI_EXTERNAL_PORT" + - "$LOKI_PORT:$LOKI_PORT" + - "$LOKI_PORT2:$LOKI_PORT2" + - "$LOKI_PORT3:$LOKI_PORT3" volumes: - $LOKI_CONFS_DIR:$LOKI_DOCKER_CONFS_DIR - $LOKI_LOGS_DIR:$LOKI_DOCKER_LOGS_DIR @@ -84,23 +81,22 @@ services: - $LOKI_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$LOKI_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$LOKI_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$LOKI.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$LOKI.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $PROMTAIL_DOCKER_NAME: image: $PROMTAIL_DOCKER_IMAGE container_name: $PROMTAIL_DOCKER_NAME working_dir: /$PROMTAIL_DOCKER_NAME ports: - - "0.0.0.0:$PROMTAIL_EXTERNAL_PORT" - - "0.0.0.0:$PROMTAIL_PORT" - - "0.0.0.0:$PROMTAIL_PORT2" - - "0.0.0.0:$PROMTAIL_PORT3" + - "$PROMTAIL_EXTERNAL_PORT:$PROMTAIL_EXTERNAL_PORT" + - "$PROMTAIL_PORT:$PROMTAIL_PORT" + - "$PROMTAIL_PORT2:$PROMTAIL_PORT2" + - "$PROMTAIL_PORT3:$PROMTAIL_PORT3" volumes: - $PROMTAIL_CONFS_DIR:$PROMTAIL_DOCKER_CONFS_DIR - $PROMTAIL_LOGS_DIR:$PROMTAIL_DOCKER_LOGS_DIR @@ -114,23 +110,22 @@ services: - $PROMTAIL_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$PROMTAIL_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$PROMTAIL_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$PROMTAIL.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$PROMTAIL.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $GRAFANA_DOCKER_NAME: image: $GRAFANA_DOCKER_IMAGE container_name: $GRAFANA_DOCKER_NAME working_dir: /$GRAFANA_DOCKER_NAME ports: - - "0.0.0.0:$GRAFANA_EXTERNAL_PORT" - - "0.0.0.0:$GRAFANA_PORT" - - "0.0.0.0:$GRAFANA_PORT2" - - "0.0.0.0:$GRAFANA_PORT3" + - "$GRAFANA_EXTERNAL_PORT:$GRAFANA_EXTERNAL_PORT" + - "$GRAFANA_PORT:$GRAFANA_PORT" + - "$GRAFANA_PORT2:$GRAFANA_PORT2" + - "$GRAFANA_PORT3:$GRAFANA_PORT3" volumes: - $GRAFANA_CONFS_DIR:$GRAFANA_DOCKER_CONFS_DIR - $GRAFANA_LOGS_DIR:$GRAFANA_DOCKER_LOGS_DIR @@ -144,53 +139,117 @@ services: - $GRAFANA_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$GRAFANA_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$GRAFANA_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$GRAFANA.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$GRAFANA.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - - $NGNIX_DOCKER_NAME: - image: $NGNIX_DOCKER_IMAGE - container_name: $NGNIX_DOCKER_NAME - working_dir: /$NGNIX_DOCKER_NAME + restart: unless-stopped + $NGINX_DOCKER_NAME: + image: $NGINX_DOCKER_IMAGE + container_name: $NGINX_DOCKER_NAME + working_dir: /$NGINX_DOCKER_NAME ports: - - "0.0.0.0:$NGNIX_EXTERNAL_PORT" - - "0.0.0.0:$NGNIX_PORT" - - "0.0.0.0:$NGNIX_PORT2" - - "0.0.0.0:$NGNIX_PORT3" + - "$NGINX_EXTERNAL_PORT:$NGINX_EXTERNAL_PORT" + - "$NGINX_PORT:$NGINX_PORT" + - "$NGINX_PORT2:$NGINX_PORT2" + - "$NGINX_PORT3:$NGINX_PORT3" + - "$REDIS_EXTERNAL_PORT:$REDIS_EXTERNAL_PORT" + - "$REDIS_PORT:$REDIS_PORT" + - "$REDIS_PORT2:$REDIS_PORT2" + - "$REDIS_PORT3:$REDIS_PORT3" + - "$POSTGRESQL_EXTERNAL_PORT:$POSTGRESQL_EXTERNAL_PORT" + - "$POSTGRESQL_PORT:$POSTGRESQL_PORT" + - "$POSTGRESQL_PORT2:$POSTGRESQL_PORT2" + - "$POSTGRESQL_PORT3:$POSTGRESQL_PORT3" + - "$LOKI_EXTERNAL_PORT:$LOKI_EXTERNAL_PORT" + - "$LOKI_PORT:$LOKI_PORT" + - "$LOKI_PORT2:$LOKI_PORT2" + - "$LOKI_PORT3:$LOKI_PORT3" + - "$PROMTAIL_EXTERNAL_PORT:$PROMTAIL_EXTERNAL_PORT" + - "$PROMTAIL_PORT:$PROMTAIL_PORT" + - "$PROMTAIL_PORT2:$PROMTAIL_PORT2" + - "$PROMTAIL_PORT3:$PROMTAIL_PORT3" + - "$GRAFANA_EXTERNAL_PORT:$GRAFANA_EXTERNAL_PORT" + - "$GRAFANA_PORT:$GRAFANA_PORT" + - "$GRAFANA_PORT2:$GRAFANA_PORT2" + - "$GRAFANA_PORT3:$GRAFANA_PORT3" + - "$TOR_EXTERNAL_PORT:$TOR_EXTERNAL_PORT" + - "$TOR_PORT:$TOR_PORT" + - "$TOR_PORT2:$TOR_PORT2" + - "$TOR_PORT3:$TOR_PORT3" + - "$_4NK_VAULT_EXTERNAL_PORT:$_4NK_VAULT_EXTERNAL_PORT" + - "$_4NK_VAULT_PORT:$_4NK_VAULT_PORT" + - "$_4NK_VAULT_PORT2:$_4NK_VAULT_PORT2" + - "$_4NK_VAULT_PORT3:$_4NK_VAULT_PORT3" + - "$BITCOIN_EXTERNAL_PORT:$BITCOIN_EXTERNAL_PORT" + - "$BITCOIN_PORT:$BITCOIN_PORT" + - "$BITCOIN_PORT2:$BITCOIN_PORT2" + - "$BITCOIN_PORT3:$BITCOIN_PORT3" + - "$BITCOIN_SIGNET_P2P_PORT:$BITCOIN_SIGNET_P2P_PORT" + - "$BITCOIN_SIGNET_RPC_PORT:$BITCOIN_SIGNET_RPC_PORT" + - "$BLINDBIT_ORACLE_EXTERNAL_PORT:$BLINDBIT_ORACLE_EXTERNAL_PORT" + - "$BLINDBIT_ORACLE_PORT:$BLINDBIT_ORACLE_PORT" + - "$BLINDBIT_ORACLE_PORT2:$BLINDBIT_ORACLE_PORT2" + - "$BLINDBIT_ORACLE_PORT3:$BLINDBIT_ORACLE_PORT3" + - "$SDK_RELAY_EXTERNAL_PORT:$SDK_RELAY_EXTERNAL_PORT" + - "$SDK_RELAY_PORT:$SDK_RELAY_PORT" + - "$SDK_RELAY_PORT2:$SDK_RELAY_PORT2" + - "$SDK_RELAY_PORT3:$SDK_RELAY_PORT3" + - "$SDK_STORAGE_EXTERNAL_PORT:$SDK_STORAGE_EXTERNAL_PORT" + - "$SDK_STORAGE_PORT:$SDK_STORAGE_PORT" + - "$SDK_STORAGE_PORT2:$SDK_STORAGE_PORT2" + - "$SDK_STORAGE_PORT3:$SDK_STORAGE_PORT3" + - "$IHM_CLIENT_EXTERNAL_PORT:$IHM_CLIENT_EXTERNAL_PORT" + - "$IHM_CLIENT_PORT:$IHM_CLIENT_PORT" + - "$IHM_CLIENT_PORT2:$IHM_CLIENT_PORT2" + - "$IHM_CLIENT_PORT3:$IHM_CLIENT_PORT3" + - "$_4NK_CERTIFICATOR_EXTERNAL_PORT:$_4NK_CERTIFICATOR_EXTERNAL_PORT" + - "$_4NK_CERTIFICATOR_PORT:$_4NK_CERTIFICATOR_PORT" + - "$_4NK_CERTIFICATOR_PORT2:$_4NK_CERTIFICATOR_PORT2" + - "$_4NK_CERTIFICATOR_PORT3:$_4NK_CERTIFICATOR_PORT3" + - "$_4NK_MINER_EXTERNAL_PORT:$_4NK_MINER_EXTERNAL_PORT" + - "$_4NK_MINER_PORT:$_4NK_MINER_PORT" + - "$_4NK_MINER_PORT2:$_4NK_MINER_PORT2" + - "$_4NK_MINER_PORT3:$_4NK_MINER_PORT3" + - "$LECOFFRE_FRONT_EXTERNAL_PORT:$LECOFFRE_FRONT_EXTERNAL_PORT" + - "$LECOFFRE_FRONT_PORT:$LECOFFRE_FRONT_PORT" + - "$LECOFFRE_FRONT_PORT2:$LECOFFRE_FRONT_PORT2" + - "$LECOFFRE_FRONT_PORT3:$LECOFFRE_FRONT_PORT3" + - "$_4NK_WEB_STATUS_EXTERNAL_PORT:$_4NK_WEB_STATUS_EXTERNAL_PORT" + - "$_4NK_WEB_STATUS_PORT:$_4NK_WEB_STATUS_PORT" + - "$_4NK_WEB_STATUS_PORT2:$_4NK_WEB_STATUS_PORT2" + - "$_4NK_WEB_STATUS_PORT3:$_4NK_WEB_STATUS_PORT3" volumes: - - $NGNIX_CONFS_DIR:$NGNIX_DOCKER_CONFS_DIR - - $NGNIX_LOGS_DIR:$NGNIX_DOCKER_LOGS_DIR - - $NGNIX_RUNS_DIR:$NGNIX_DOCKER_RUNS_DIR - - $NGNIX_DATAS_DIR:$NGNIX_DOCKER_DATAS_DIR - - $NGNIX_BACKUPS_DIR:$NGNIX_DOCKER_BACKUPS_DIR - - $NGNIX_SCRIPTS_DIR:$NGNIX_DOCKER_SCRIPTS_DIR + - $NGINX_CONFS_DIR:$NGINX_DOCKER_CONFS_DIR + - $NGINX_LOGS_DIR:$NGINX_DOCKER_LOGS_DIR + - $NGINX_RUNS_DIR:$NGINX_DOCKER_RUNS_DIR + - $NGINX_DATAS_DIR:$NGINX_DOCKER_DATAS_DIR + - $NGINX_BACKUPS_DIR:$NGINX_DOCKER_BACKUPS_DIR + - $NGINX_SCRIPTS_DIR:$NGINX_DOCKER_SCRIPTS_DIR networks: btcnet: aliases: - - $NGNIX_DOCKER_NAME + - $NGINX_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$NGNIX_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$NGINX_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$NGNIX.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$NGINX.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $TOR_DOCKER_NAME: image: $TOR_DOCKER_IMAGE container_name: $TOR_DOCKER_NAME working_dir: /$TOR_DOCKER_NAME ports: - - "0.0.0.0:$TOR_EXTERNAL_PORT" - - "0.0.0.0:$TOR_PORT" - - "0.0.0.0:$TOR_PORT2" - - "0.0.0.0:$TOR_PORT3" + - "$TOR_EXTERNAL_PORT:$TOR_EXTERNAL_PORT" + - "$TOR_PORT:$TOR_PORT" + - "$TOR_PORT2:$TOR_PORT2" + - "$TOR_PORT3:$TOR_PORT3" volumes: - $TOR_CONFS_DIR:$TOR_DOCKER_CONFS_DIR - $TOR_LOGS_DIR:$TOR_DOCKER_LOGS_DIR @@ -204,23 +263,22 @@ services: - $TOR_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$TOR_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$TOR_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$TOR.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$TOR.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $_4NK_VAULT_DOCKER_NAME: image: $_4NK_VAULT_DOCKER_IMAGE container_name: $_4NK_VAULT_DOCKER_NAME working_dir: /$_4NK_VAULT_DOCKER_NAME ports: - - "0.0.0.0:$_4NK_VAULT_EXTERNAL_PORT" - - "0.0.0.0:$_4NK_VAULT_PORT" - - "0.0.0.0:$_4NK_VAULT_PORT2" - - "0.0.0.0:$_4NK_VAULT_PORT3" + - "$_4NK_VAULT_EXTERNAL_PORT:$_4NK_VAULT_EXTERNAL_PORT" + - "$_4NK_VAULT_PORT:$_4NK_VAULT_PORT" + - "$_4NK_VAULT_PORT2:$_4NK_VAULT_PORT2" + - "$_4NK_VAULT_PORT3:$_4NK_VAULT_PORT3" volumes: - $_4NK_VAULT_CONFS_DIR:$_4NK_VAULT_DOCKER_CONFS_DIR - $_4NK_VAULT_LOGS_DIR:$_4NK_VAULT_DOCKER_LOGS_DIR @@ -234,23 +292,24 @@ services: - $_4NK_VAULT_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$_4NK_VAULT_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$_4NK_VAULT_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_VAULT.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_VAULT.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $BITCOIN_DOCKER_NAME: image: $BITCOIN_DOCKER_IMAGE container_name: $BITCOIN_DOCKER_NAME working_dir: /$BITCOIN_DOCKER_NAME ports: - - "0.0.0.0:$BITCOIN_EXTERNAL_PORT" - - "0.0.0.0:$BITCOIN_PORT" - - "0.0.0.0:$BITCOIN_PORT2" - - "0.0.0.0:$BITCOIN_PORT3" + - "$BITCOIN_EXTERNAL_PORT:$BITCOIN_EXTERNAL_PORT" + - "$BITCOIN_PORT:$BITCOIN_PORT" + - "$BITCOIN_PORT2:$BITCOIN_PORT2" + - "$BITCOIN_PORT3:$BITCOIN_PORT3" + - "$BITCOIN_SIGNET_P2P_PORT:$BITCOIN_SIGNET_P2P_PORT" + - "$BITCOIN_SIGNET_RPC_PORT:$BITCOIN_SIGNET_RPC_PORT" volumes: - $BITCOIN_CONFS_DIR:$BITCOIN_DOCKER_CONFS_DIR - $BITCOIN_LOGS_DIR:$BITCOIN_DOCKER_LOGS_DIR @@ -264,23 +323,22 @@ services: - $BITCOIN_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$BITCOIN_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$BITCOIN_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$BITCOIN.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$BITCOIN.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $BLINDBIT_ORACLE_DOCKER_NAME: image: $BLINDBIT_ORACLE_DOCKER_IMAGE container_name: $BLINDBIT_ORACLE_DOCKER_NAME working_dir: /$BLINDBIT_ORACLE_DOCKER_NAME ports: - - "0.0.0.0:$BLINDBIT_ORACLE_EXTERNAL_PORT" - - "0.0.0.0:$BLINDBIT_ORACLE_PORT" - - "0.0.0.0:$BLINDBIT_ORACLE_PORT2" - - "0.0.0.0:$BLINDBIT_ORACLE_PORT3" + - "$BLINDBIT_ORACLE_EXTERNAL_PORT:$BLINDBIT_ORACLE_EXTERNAL_PORT" + - "$BLINDBIT_ORACLE_PORT:$BLINDBIT_ORACLE_PORT" + - "$BLINDBIT_ORACLE_PORT2:$BLINDBIT_ORACLE_PORT2" + - "$BLINDBIT_ORACLE_PORT3:$BLINDBIT_ORACLE_PORT3" volumes: - $BLINDBIT_ORACLE_CONFS_DIR:$BLINDBIT_ORACLE_DOCKER_CONFS_DIR - $BLINDBIT_ORACLE_LOGS_DIR:$BLINDBIT_ORACLE_DOCKER_LOGS_DIR @@ -294,23 +352,22 @@ services: - $BLINDBIT_ORACLE_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$BLINDBIT_ORACLE_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$BLINDBIT_ORACLE_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$BLINDBIT_ORACLE.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$BLINDBIT_ORACLE.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $SDK_RELAY_DOCKER_NAME: image: $SDK_RELAY_DOCKER_IMAGE container_name: $SDK_RELAY_DOCKER_NAME working_dir: /$SDK_RELAY_DOCKER_NAME ports: - - "0.0.0.0:$SDK_RELAY_EXTERNAL_PORT" - - "0.0.0.0:$SDK_RELAY_PORT" - - "0.0.0.0:$SDK_RELAY_PORT2" - - "0.0.0.0:$SDK_RELAY_PORT3" + - "$SDK_RELAY_EXTERNAL_PORT:$SDK_RELAY_EXTERNAL_PORT" + - "$SDK_RELAY_PORT:$SDK_RELAY_PORT" + - "$SDK_RELAY_PORT2:$SDK_RELAY_PORT2" + - "$SDK_RELAY_PORT3:$SDK_RELAY_PORT3" volumes: - $SDK_RELAY_CONFS_DIR:$SDK_RELAY_DOCKER_CONFS_DIR - $SDK_RELAY_LOGS_DIR:$SDK_RELAY_DOCKER_LOGS_DIR @@ -324,23 +381,22 @@ services: - $SDK_RELAY_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$SDK_RELAY_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$SDK_RELAY_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$SDK_RELAY.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$SDK_RELAY.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $SDK_STORAGE_DOCKER_NAME: image: $SDK_STORAGE_DOCKER_IMAGE container_name: $SDK_STORAGE_DOCKER_NAME working_dir: /$SDK_STORAGE_DOCKER_NAME ports: - - "0.0.0.0:$SDK_STORAGE_EXTERNAL_PORT" - - "0.0.0.0:$SDK_STORAGE_PORT" - - "0.0.0.0:$SDK_STORAGE_PORT2" - - "0.0.0.0:$SDK_STORAGE_PORT3" + - "$SDK_STORAGE_EXTERNAL_PORT:$SDK_STORAGE_EXTERNAL_PORT" + - "$SDK_STORAGE_PORT:$SDK_STORAGE_PORT" + - "$SDK_STORAGE_PORT2:$SDK_STORAGE_PORT2" + - "$SDK_STORAGE_PORT3:$SDK_STORAGE_PORT3" volumes: - $SDK_STORAGE_CONFS_DIR:$SDK_STORAGE_DOCKER_CONFS_DIR - $SDK_STORAGE_LOGS_DIR:$SDK_STORAGE_DOCKER_LOGS_DIR @@ -354,23 +410,22 @@ services: - $SDK_STORAGE_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$SDK_STORAGE_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$SDK_STORAGE_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$SDK_STORAGE.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$SDK_STORAGE.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $IHM_CLIENT_DOCKER_NAME: image: $IHM_CLIENT_DOCKER_IMAGE container_name: $IHM_CLIENT_DOCKER_NAME working_dir: /$IHM_CLIENT_DOCKER_NAME ports: - - "0.0.0.0:$IHM_CLIENT_EXTERNAL_PORT" - - "0.0.0.0:$IHM_CLIENT_PORT" - - "0.0.0.0:$IHM_CLIENT_PORT2" - - "0.0.0.0:$IHM_CLIENT_PORT3" + - "$IHM_CLIENT_EXTERNAL_PORT:$IHM_CLIENT_EXTERNAL_PORT" + - "$IHM_CLIENT_PORT:$IHM_CLIENT_PORT" + - "$IHM_CLIENT_PORT2:$IHM_CLIENT_PORT2" + - "$IHM_CLIENT_PORT3:$IHM_CLIENT_PORT3" volumes: - $IHM_CLIENT_CONFS_DIR:$IHM_CLIENT_DOCKER_CONFS_DIR - $IHM_CLIENT_LOGS_DIR:$IHM_CLIENT_DOCKER_LOGS_DIR @@ -384,23 +439,22 @@ services: - $IHM_CLIENT_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$IHM_CLIENT_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$IHM_CLIENT_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$IHM_CLIENT.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$IHM_CLIENT.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $_4NK_CERTIFICATOR_DOCKER_NAME: image: $_4NK_CERTIFICATOR_DOCKER_IMAGE container_name: $_4NK_CERTIFICATOR_DOCKER_NAME working_dir: /$_4NK_CERTIFICATOR_DOCKER_NAME ports: - - "0.0.0.0:$_4NK_CERTIFICATOR_EXTERNAL_PORT" - - "0.0.0.0:$_4NK_CERTIFICATOR_PORT" - - "0.0.0.0:$_4NK_CERTIFICATOR_PORT2" - - "0.0.0.0:$_4NK_CERTIFICATOR_PORT3" + - "$_4NK_CERTIFICATOR_EXTERNAL_PORT:$_4NK_CERTIFICATOR_EXTERNAL_PORT" + - "$_4NK_CERTIFICATOR_PORT:$_4NK_CERTIFICATOR_PORT" + - "$_4NK_CERTIFICATOR_PORT2:$_4NK_CERTIFICATOR_PORT2" + - "$_4NK_CERTIFICATOR_PORT3:$_4NK_CERTIFICATOR_PORT3" volumes: - $_4NK_CERTIFICATOR_CONFS_DIR:$_4NK_CERTIFICATOR_DOCKER_CONFS_DIR - $_4NK_CERTIFICATOR_LOGS_DIR:$_4NK_CERTIFICATOR_DOCKER_LOGS_DIR @@ -414,23 +468,22 @@ services: - $_4NK_CERTIFICATOR_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$_4NK_CERTIFICATOR_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$_4NK_CERTIFICATOR_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_CERTIFICATOR.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_CERTIFICATOR.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $_4NK_MINER_DOCKER_NAME: image: $_4NK_MINER_DOCKER_IMAGE container_name: $_4NK_MINER_DOCKER_NAME working_dir: /$_4NK_MINER_DOCKER_NAME ports: - - "0.0.0.0:$_4NK_MINER_EXTERNAL_PORT" - - "0.0.0.0:$_4NK_MINER_PORT" - - "0.0.0.0:$_4NK_MINER_PORT2" - - "0.0.0.0:$_4NK_MINER_PORT3" + - "$_4NK_MINER_EXTERNAL_PORT:$_4NK_MINER_EXTERNAL_PORT" + - "$_4NK_MINER_PORT:$_4NK_MINER_PORT" + - "$_4NK_MINER_PORT2:$_4NK_MINER_PORT2" + - "$_4NK_MINER_PORT3:$_4NK_MINER_PORT3" volumes: - $_4NK_MINER_CONFS_DIR:$_4NK_MINER_DOCKER_CONFS_DIR - $_4NK_MINER_LOGS_DIR:$_4NK_MINER_DOCKER_LOGS_DIR @@ -444,23 +497,22 @@ services: - $_4NK_MINER_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$_4NK_MINER_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$_4NK_MINER_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_MINER.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_MINER.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $LECOFFRE_FRONT_DOCKER_NAME: image: $LECOFFRE_FRONT_DOCKER_IMAGE container_name: $LECOFFRE_FRONT_DOCKER_NAME working_dir: /$LECOFFRE_FRONT_DOCKER_NAME ports: - - "0.0.0.0:$LECOFFRE_FRONT_EXTERNAL_PORT" - - "0.0.0.0:$LECOFFRE_FRONT_PORT" - - "0.0.0.0:$LECOFFRE_FRONT_PORT2" - - "0.0.0.0:$LECOFFRE_FRONT_PORT3" + - "$LECOFFRE_FRONT_EXTERNAL_PORT:$LECOFFRE_FRONT_EXTERNAL_PORT" + - "$LECOFFRE_FRONT_PORT:$LECOFFRE_FRONT_PORT" + - "$LECOFFRE_FRONT_PORT2:$LECOFFRE_FRONT_PORT2" + - "$LECOFFRE_FRONT_PORT3:$LECOFFRE_FRONT_PORT3" volumes: - $LECOFFRE_FRONT_CONFS_DIR:$LECOFFRE_FRONT_DOCKER_CONFS_DIR - $LECOFFRE_FRONT_LOGS_DIR:$LECOFFRE_FRONT_DOCKER_LOGS_DIR @@ -474,23 +526,22 @@ services: - $LECOFFRE_FRONT_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$LECOFFRE_FRONT_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$LECOFFRE_FRONT_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$LECOFFRE_FRONT.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$LECOFFRE_FRONT.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" - + restart: unless-stopped $_4NK_WEB_STATUS_DOCKER_NAME: image: $_4NK_WEB_STATUS_DOCKER_IMAGE container_name: $_4NK_WEB_STATUS_DOCKER_NAME working_dir: /$_4NK_WEB_STATUS_DOCKER_NAME ports: - - "0.0.0.0:$_4NK_WEB_STATUS_EXTERNAL_PORT" - - "0.0.0.0:$_4NK_WEB_STATUS_PORT" - - "0.0.0.0:$_4NK_WEB_STATUS_PORT2" - - "0.0.0.0:$_4NK_WEB_STATUS_PORT3" + - "$_4NK_WEB_STATUS_EXTERNAL_PORT:$_4NK_WEB_STATUS_EXTERNAL_PORT" + - "$_4NK_WEB_STATUS_PORT:$_4NK_WEB_STATUS_PORT" + - "$_4NK_WEB_STATUS_PORT2:$_4NK_WEB_STATUS_PORT2" + - "$_4NK_WEB_STATUS_PORT3:$_4NK_WEB_STATUS_PORT3" volumes: - $_4NK_WEB_STATUS_CONFS_DIR:$_4NK_WEB_STATUS_DOCKER_CONFS_DIR - $_4NK_WEB_STATUS_LOGS_DIR:$_4NK_WEB_STATUS_DOCKER_LOGS_DIR @@ -504,13 +555,13 @@ services: - $_4NK_WEB_STATUS_DOCKER_NAME user: root entrypoint: \> - /bin/sh -c "$_4NK_WEB_STATUS_DOCKER_WORKING_DIR_CREATE" + /bin/sh -c \"$_4NK_WEB_STATUS_DOCKER_WORKING_DIR_CREATE\" healthcheck: - test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_WEB_STATUS.sh"] + test: [\"CMD\", \"sh\", \"$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$_4NK_WEB_STATUS.sh\"] interval: 30s timeout: 10s retries: 50 - restart: unless-stopped" + restart: unless-stopped watchtower: diff --git a/templates/dev/generate_nginx_configs.sh b/templates/dev/generate_nginx_configs.sh index 8de5d32..73d19b8 100755 --- a/templates/dev/generate_nginx_configs.sh +++ b/templates/dev/generate_nginx_configs.sh @@ -53,6 +53,7 @@ EOF for SERVICE_VAR in "${SERVICES[@]}"; do echo " 🔄 Génération upstream pour $SERVICE_VAR" + # Upstream principal (port standard) cat >> "_4NK_modules/nginx/upstreams.conf" << EOF upstream \$${SERVICE_VAR} { @@ -60,6 +61,54 @@ upstream \$${SERVICE_VAR} { keepalive 64; } EOF + + # Upstream pour le port externe + cat >> "_4NK_modules/nginx/upstreams.conf" << EOF + +upstream \$${SERVICE_VAR}_EXTERNAL { + server \$${SERVICE_VAR}_DOCKER_NAME:\$${SERVICE_VAR}_EXTERNAL_PORT; + keepalive 64; +} +EOF + + # Upstream pour PORT2 si défini + cat >> "_4NK_modules/nginx/upstreams.conf" << EOF + +upstream \$${SERVICE_VAR}_PORT2 { + server \$${SERVICE_VAR}_DOCKER_NAME:\$${SERVICE_VAR}_PORT2; + keepalive 64; +} +EOF + + # Upstream pour PORT3 si défini + cat >> "_4NK_modules/nginx/upstreams.conf" << EOF + +upstream \$${SERVICE_VAR}_PORT3 { + server \$${SERVICE_VAR}_DOCKER_NAME:\$${SERVICE_VAR}_PORT3; + keepalive 64; +} +EOF + + # Upstreams spécifiques pour Bitcoin + if [ "$SERVICE_VAR" = "BITCOIN" ]; then + # Upstream pour le port P2P Bitcoin + cat >> "_4NK_modules/nginx/upstreams.conf" << EOF + +upstream \$${SERVICE_VAR}_P2P { + server \$${SERVICE_VAR}_DOCKER_NAME:\$${SERVICE_VAR}_SIGNET_P2P_PORT; + keepalive 64; +} +EOF + + # Upstream pour le port RPC Bitcoin + cat >> "_4NK_modules/nginx/upstreams.conf" << EOF + +upstream \$${SERVICE_VAR}_RPC { + server \$${SERVICE_VAR}_DOCKER_NAME:\$${SERVICE_VAR}_SIGNET_RPC_PORT; + keepalive 64; +} +EOF + fi done echo "✅ Fichier upstreams.conf généré" @@ -83,6 +132,7 @@ EOF for SERVICE_VAR in "${SERVICES[@]}"; do echo " 🔄 Génération config interne pour $SERVICE_VAR" + # Générer la configuration pour le port principal cat >> "_4NK_modules/nginx/app-internal-ports.conf" << EOF server { @@ -106,6 +156,114 @@ server { } } EOF + + # Générer la configuration pour le port externe + cat >> "_4NK_modules/nginx/app-internal-ports.conf" << EOF + +server { + listen \$${SERVICE_VAR}_EXTERNAL_PORT default_server; + server_name _; # pas d'host requis + access_log \$$NGINX_LOGS_DIR/\$${SERVICE_VAR}_ext.log app_json; + + location / { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade \$http_upgrade; + proxy_set_header Connection "upgrade"; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} +EOF + + # Générer la configuration pour PORT2 si défini + cat >> "_4NK_modules/nginx/app-internal-ports.conf" << EOF + +server { + listen \$${SERVICE_VAR}_PORT2 default_server; + server_name _; # pas d'host requis + access_log \$$NGINX_LOGS_DIR/\$${SERVICE_VAR}_port2.log app_json; + + location / { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade \$http_upgrade; + proxy_set_header Connection "upgrade"; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} +EOF + + # Générer la configuration pour PORT3 si défini + cat >> "_4NK_modules/nginx/app-internal-ports.conf" << EOF + +server { + listen \$${SERVICE_VAR}_PORT3 default_server; + server_name _; # pas d'host requis + access_log \$$NGINX_LOGS_DIR/\$${SERVICE_VAR}_port3.log app_json; + + location / { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + } + + # websocket (si nécessaire) + location /ws/ { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + proxy_http_version 1.1; + proxy_set_header Upgrade \$http_upgrade; + proxy_set_header Connection "upgrade"; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + proxy_read_timeout 3600s; + } +} +EOF + + # Générer les configurations spécifiques pour Bitcoin + if [ "$SERVICE_VAR" = "BITCOIN" ]; then + # Configuration pour le port P2P Bitcoin + cat >> "_4NK_modules/nginx/app-internal-ports.conf" << EOF + +server { + listen \$${SERVICE_VAR}_SIGNET_P2P_PORT default_server; + server_name _; # pas d'host requis + access_log \$$NGINX_LOGS_DIR/\$${SERVICE_VAR}_p2p.log app_json; + + location / { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + } +} +EOF + + # Configuration pour le port RPC Bitcoin + cat >> "_4NK_modules/nginx/app-internal-ports.conf" << EOF + +server { + listen \$${SERVICE_VAR}_SIGNET_RPC_PORT default_server; + server_name _; # pas d'host requis + access_log \$$NGINX_LOGS_DIR/\$${SERVICE_VAR}_rpc.log app_json; + + location / { + proxy_pass http://\$${SERVICE_VAR}_DOCKER_NAME; + include \$$NGINX_CONFS_DIR/proxy_headers.conf; + } +} +EOF + fi done echo "✅ Fichier app-internal-ports.conf généré" @@ -127,17 +285,17 @@ generate_https_configs() { server { listen 80; - server_name \$${SERVICE_VAR}.\$$DOMAIN; + server_name \$${SERVICE_VAR}.\$$HOST; # redirection HTTP→HTTPS pour l'externe - return 301 https://\$host\$request_uri; + return 301 https://\$${SERVICE_VAR}.\$$HOST\$request_uri; } server { listen 443 ssl http2; - server_name \$${SERVICE_VAR}_DOCKER_NAME.\$$DOMAIN; + server_name \$${SERVICE_VAR}.\$$HOST; -ssl_certificate /etc/letsencrypt/live/$HOST/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/$HOST/privkey.pem; +ssl_certificate /etc/letsencrypt/live/\$$HOST/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/\$$HOST/privkey.pem; # réglages TLS minimaux (adapter selon politique) diff --git a/templates/dev/generate_variables.sh b/templates/dev/generate_variables.sh index fc1fbb9..be3f1f1 100755 --- a/templates/dev/generate_variables.sh +++ b/templates/dev/generate_variables.sh @@ -22,9 +22,19 @@ load_env_files() { # Charger les variables d'environnement dans l'ordre load_env_files +# Générer la variable HOST si elle n'est pas définie +if [ -z "$HOST" ]; then + HOST="dev4.${DOMAIN}" +fi + # Supprimer les fichiers de sortie existants (remplacer complètement) rm -f .env.auto docker-compose.yml.auto +# Générer les variables de base +echo "# ====== BASE VARIABLES ======" >> .env.auto +echo "HOST=$HOST" >> .env.auto +echo "" >> .env.auto + echo " services: " >> docker-compose.yml.auto @@ -72,16 +82,55 @@ generate_variables() { fi echo "" - echo " + + # Construire la section ports dynamiquement + local ports_section="" + + # Si c'est Nginx, ajouter tous les ports de tous les services + if [ "$VARIABLE" = "NGINX" ]; then + # Ports propres à Nginx + ports_section=" - \"\$${VARIABLE}_EXTERNAL_PORT:\$${VARIABLE}_EXTERNAL_PORT\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_PORT:\$${VARIABLE}_PORT\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_PORT2:\$${VARIABLE}_PORT2\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_PORT3:\$${VARIABLE}_PORT3\"" + + # Ajouter tous les ports de tous les autres services + for SERVICE_VAR in "${SERVICES[@]}"; do + if [ "$SERVICE_VAR" != "NGINX" ]; then + ports_section="$ports_section\n - \"\$${SERVICE_VAR}_EXTERNAL_PORT:\$${SERVICE_VAR}_EXTERNAL_PORT\"" + ports_section="$ports_section\n - \"\$${SERVICE_VAR}_PORT:\$${SERVICE_VAR}_PORT\"" + ports_section="$ports_section\n - \"\$${SERVICE_VAR}_PORT2:\$${SERVICE_VAR}_PORT2\"" + ports_section="$ports_section\n - \"\$${SERVICE_VAR}_PORT3:\$${SERVICE_VAR}_PORT3\"" + + # Ports spécifiques pour Bitcoin + if [ "$SERVICE_VAR" = "BITCOIN" ]; then + ports_section="$ports_section\n - \"\$${SERVICE_VAR}_SIGNET_P2P_PORT:\$${SERVICE_VAR}_SIGNET_P2P_PORT\"" + ports_section="$ports_section\n - \"\$${SERVICE_VAR}_SIGNET_RPC_PORT:\$${SERVICE_VAR}_SIGNET_RPC_PORT\"" + fi + fi + done + else + # Pour les autres services, ports normaux + ports_section=" - \"\$${VARIABLE}_EXTERNAL_PORT:\$${VARIABLE}_EXTERNAL_PORT\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_PORT:\$${VARIABLE}_PORT\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_PORT2:\$${VARIABLE}_PORT2\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_PORT3:\$${VARIABLE}_PORT3\"" + + # Ajouter les ports spécifiques pour Bitcoin + if [ "$VARIABLE" = "BITCOIN" ]; then + ports_section="$ports_section\n - \"\$${VARIABLE}_SIGNET_P2P_PORT:\$${VARIABLE}_SIGNET_P2P_PORT\"" + ports_section="$ports_section\n - \"\$${VARIABLE}_SIGNET_RPC_PORT:\$${VARIABLE}_SIGNET_RPC_PORT\"" + fi + fi + + # Générer la section complète du service + cat << EOF >> docker-compose.yml.auto \$${VARIABLE}_DOCKER_NAME: image: \$${VARIABLE}_DOCKER_IMAGE container_name: \$${VARIABLE}_DOCKER_NAME working_dir: /\$${VARIABLE}_DOCKER_NAME ports: - - \"0.0.0.0:\$${VARIABLE}_EXTERNAL_PORT\" - - \"0.0.0.0:\$${VARIABLE}_PORT\" - - \"0.0.0.0:\$${VARIABLE}_PORT2\" - - \"0.0.0.0:\$${VARIABLE}_PORT3\" +$(printf "$ports_section") volumes: - \$${VARIABLE}_CONFS_DIR:\$${VARIABLE}_DOCKER_CONFS_DIR - \$${VARIABLE}_LOGS_DIR:\$${VARIABLE}_DOCKER_LOGS_DIR @@ -101,7 +150,8 @@ generate_variables() { interval: 30s timeout: 10s retries: 50 - restart: unless-stopped\"" >> docker-compose.yml.auto + restart: unless-stopped +EOF echo "" } diff --git a/templates/dev/logrotade/ngnix.conf b/templates/dev/logrotade/nginx.conf similarity index 68% rename from templates/dev/logrotade/ngnix.conf rename to templates/dev/logrotade/nginx.conf index 6c99fa9..97a6fb2 100644 --- a/templates/dev/logrotade/ngnix.conf +++ b/templates/dev/logrotade/nginx.conf @@ -1,4 +1,4 @@ -$NGNIX_LOGS_DIR/*.log { +$NGINX_LOGS_DIR/*.log { daily missingok rotate 7 @@ -8,6 +8,6 @@ $NGNIX_LOGS_DIR/*.log { create 644 root root postrotate # Redémarrer le service si nécessaire - docker restart $NGNIX_DOCKER_NAME 2>/dev/null || true + docker restart $NGINX_DOCKER_NAME 2>/dev/null || true endscript } diff --git a/templates/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto b/templates/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto index 0ffbc69..1a2a5a8 100644 --- a/templates/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto +++ b/templates/dev/projects/lecoffre/lecoffre_node/docker-compose.yml.auto @@ -152,6 +152,36 @@ services: retries: 50 restart: unless-stopped" + $NGINX_DOCKER_NAME: + image: $NGINX_DOCKER_IMAGE + container_name: $NGINX_DOCKER_NAME + working_dir: /$NGINX_DOCKER_NAME + ports: + - "0.0.0.0:$NGINX_EXTERNAL_PORT" + - "0.0.0.0:$NGINX_PORT" + - "0.0.0.0:$NGINX_PORT2" + - "0.0.0.0:$NGINX_PORT3" + volumes: + - $NGINX_CONFS_DIR:$NGINX_DOCKER_CONFS_DIR + - $NGINX_LOGS_DIR:$NGINX_DOCKER_LOGS_DIR + - $NGINX_RUNS_DIR:$NGINX_DOCKER_RUNS_DIR + - $NGINX_DATAS_DIR:$NGINX_DOCKER_DATAS_DIR + - $NGINX_BACKUPS_DIR:$NGINX_DOCKER_BACKUPS_DIR + - $NGINX_SCRIPTS_DIR:$NGINX_DOCKER_SCRIPTS_DIR + networks: + btcnet: + aliases: + - $NGINX_DOCKER_NAME + user: root + entrypoint: \> + /bin/sh -c "$NGINX_DOCKER_WORKING_DIR_CREATE" + healthcheck: + test: ["CMD", "sh", "$LECONFFRE-FRONT_CONFS_DIR/healthcheck_$NGINX.sh"] + interval: 30s + timeout: 10s + retries: 50 + restart: unless-stopped" + $_4NK_VAULT_DOCKER_NAME: image: $_4NK_VAULT_DOCKER_IMAGE container_name: $_4NK_VAULT_DOCKER_NAME diff --git a/templates/dev/replace_variables_and_copy.sh b/templates/dev/replace_variables_and_copy.sh index be9195b..752805d 100755 --- a/templates/dev/replace_variables_and_copy.sh +++ b/templates/dev/replace_variables_and_copy.sh @@ -164,11 +164,48 @@ replace_variables_in_file() { fi done - # Copier le résultat final - cp "$temp_file1" "$output_file" - - # Nettoyer les fichiers temporaires - rm -f "$temp_file1" "$temp_file2" + # Copier le résultat final + cp "$temp_file1" "$output_file" + + # Nettoyer les fichiers temporaires + rm -f "$temp_file1" "$temp_file2" + + # Post-traitement spécial pour docker-compose.yml.auto : nettoyer les ports vides + if [[ "$input_file" == *"docker-compose.yml.auto"* ]]; then + print_info "Nettoyage des ports vides dans $output_file" + + # Créer un fichier temporaire pour le nettoyage + local temp_clean=$(mktemp) + + # Traiter le fichier pour supprimer les lignes de ports vides + while IFS= read -r line; do + # Si c'est une ligne de port, vérifier si elle contient des valeurs vides + if echo "$line" | grep -q '^\s*-\s*".*:.*"'; then + # Vérifier si la ligne contient ":" vide (ex: "- ":" ou "- ::") + if echo "$line" | grep -q '":\s*"'; then + # Ignorer cette ligne (port vide) + continue + fi + # Vérifier si la ligne contient ":" au début (ex: "- ":" ou "- ::") + if echo "$line" | grep -q '":\s*:'; then + # Ignorer cette ligne (port vide) + continue + fi + # Vérifier si la ligne contient ":" à la fin (ex: "- ":" ou "- ::") + if echo "$line" | grep -q ':\s*"$'; then + # Ignorer cette ligne (port vide) + continue + fi + fi + # Garder la ligne si elle n'est pas un port vide + echo "$line" >> "$temp_clean" + done < "$output_file" + + # Remplacer le fichier original + mv "$temp_clean" "$output_file" + + print_info "Ports vides nettoyés dans $output_file" + fi else print_warning "envsubst non disponible, utilisation de sed pour le remplacement basique"