From c54c8897ac6fbf1783b0d6659366f1d2d7ac590e Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 2 Jun 2025 02:50:22 +0300 Subject: [PATCH] fix --- nginx/nginx-dev/prepare.py | 10 +++++----- nginx/nginx-dev/run.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index d6be531..88104e1 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -20,10 +20,10 @@ for host in hosts: server \{ listen 443 ssl http2; listen [::]:443 ssl http2; - server_name {0}; + server_name {host}; - ssl_certificate /etc/nginx/{0}/fullchain.pem; - ssl_certificate_key /etc/nginx/{0}/privkey.pem; + ssl_certificate /etc/nginx/{host}/fullchain.pem; + ssl_certificate_key /etc/nginx/{host}/privkey.pem; add_header X-Frame-Options "SAMEORIGIN" always; add_header X-XSS-Protection "1; mode=block" always; @@ -32,10 +32,10 @@ for host in hosts: add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / \{ - proxy_pass http://{1}-nginx:1238$request_uri; + proxy_pass http://{pre_domain}-nginx:1238$request_uri; \} \}\n\n - '''.format(host, host.split('.')[0]) + '''.format(host=host, pre_domain=host.split('.')[0]) fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem') privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem') with open(f"/etc/nginx/{host}/fullchain.pem", 'wb') as fp: diff --git a/nginx/nginx-dev/run.sh b/nginx/nginx-dev/run.sh index 154f920..f4b12dc 100644 --- a/nginx/nginx-dev/run.sh +++ b/nginx/nginx-dev/run.sh @@ -1,4 +1,4 @@ #!/bin/bash python3 prepare.py -nginx -g daemon off; \ No newline at end of file +/docker-entrypoint.sh nginx -g daemon off; \ No newline at end of file -- 2.45.2