From c3a29a534699b8d9fb605cdd6556d855b7b15fdf Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Thu, 28 Aug 2025 01:53:29 +0500 Subject: [PATCH] modified: serv_nginx/nginx/switch-config.sh revert midifaers to only one check when up conteiner --- serv_nginx/nginx/switch-config.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/serv_nginx/nginx/switch-config.sh b/serv_nginx/nginx/switch-config.sh index 3e83e64..7c3eccd 100644 --- a/serv_nginx/nginx/switch-config.sh +++ b/serv_nginx/nginx/switch-config.sh @@ -1,18 +1,18 @@ #!/bin/bash -# Проверяем наличие всех сертификатов каждые 1 минуту, пока они не появятся -while \ - [ ! -f "/etc/letsencrypt/live/yalarba.ru/fullchain.pem" ] || \ - [ ! -f "/etc/letsencrypt/live/easysite102.ru/fullchain.pem" ] || \ - [ ! -f "/etc/letsencrypt/live/valitovgaziz.ru/fullchain.pem" ] || \ - [ ! -f "/etc/letsencrypt/live/begushiybashkir.ru/fullchain.pem" ] || \ - [ ! -f "/etc/letsencrypt/live/xn--80abahjtcfl5d0a8di.xn--p1ai/fullchain.pem" ]; do - echo "SSL certificates not yet available. Waiting for 5 minutes..." - sleep 60 -done - -echo "All SSL certificates found. Switching to HTTPS configuration" -ln -sf /etc/nginx/nginx-ssl.conf /etc/nginx/conf.d/default.conf +# Проверяем наличие сертификатов для всех трёх доменов +if \ + [ -f "/etc/letsencrypt/live/yalarba.ru/fullchain.pem" ] && \ + [ -f "/etc/letsencrypt/live/easysite102.ru/fullchain.pem" ] && \ + [ -f "/etc/letsencrypt/live/valitovgaziz.ru/fullchain.pem" ] && \ + [ -f "/etc/letsencrypt/live/begushiybashkir.ru/fullchain.pem" ] && \ + [ -f "/etc/letsencrypt/live/xn--80abahjtcfl5d0a8di.xn--p1ai/fullchain.pem" ]; then + echo "SSL certificates found for all domains, switching to HTTPS configuration" + ln -sf /etc/nginx/nginx-ssl.conf /etc/nginx/conf.d/default.conf +else + echo "SSL certificates not found, using HTTP only configuration" + ln -sf /etc/nginx/nginx-http.conf /etc/nginx/conf.d/default.conf +fi # Проверяем конфигурацию nginx -nginx -t \ No newline at end of file +nginx -t