diff --git a/serv_nginx/docker-compose.yml b/serv_nginx/docker-compose.yml index 259a3b6..3819a03 100644 --- a/serv_nginx/docker-compose.yml +++ b/serv_nginx/docker-compose.yml @@ -29,9 +29,10 @@ services: volumes: - certbot_data:/etc/letsencrypt - certbot_www:/var/www/certbot - - ../serv_spa/spa/vue/dist:/usr/share/nginx/html + - ../serv_spa/spa/vue/dist:/usr/share/nginx/yalarba/html - ../valitovgaziz/html:/usr/share/nginx/valitovgaziz/html - ../easySite/easy-site/prod:/usr/share/nginx/easysite102/html + - ./ZagirAminev/src:/usr/share/nginx/бегущийбашкир.рф/html networks: - web-network - internal diff --git a/serv_nginx/nginx/Dockerfile b/serv_nginx/nginx/Dockerfile index a9aec61..de83344 100644 --- a/serv_nginx/nginx/Dockerfile +++ b/serv_nginx/nginx/Dockerfile @@ -11,8 +11,8 @@ COPY nginx-ssl.conf /etc/nginx/nginx-ssl.conf RUN ln -sf /etc/nginx/nginx-http.conf /etc/nginx/conf.d/default.conf # Скрипт для проверки сертификатов и переключения конфига -COPY switch-config.sh /docker-entrypoint.d/40-switch-config.sh -RUN chmod +x /docker-entrypoint.d/40-switch-config.sh +COPY switch-config.sh /docker-entrypoint.d/switch-config.sh +RUN chmod +x /docker-entrypoint.d/switch-config.sh # Создаем необходимые директории RUN mkdir -p /var/www/certbot diff --git a/serv_nginx/nginx/nginx-http.conf b/serv_nginx/nginx/nginx-http.conf index 81acdf8..4265c95 100644 --- a/serv_nginx/nginx/nginx-http.conf +++ b/serv_nginx/nginx/nginx-http.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name yalarba.ru; + server_name yalarba.ru easysite102.ru valitovgaziz.ru бегущийбашкир.рф; location / { root /usr/share/nginx/html; diff --git a/serv_nginx/nginx/nginx-ssl.conf b/serv_nginx/nginx/nginx-ssl.conf index ebc8999..c91e447 100644 --- a/serv_nginx/nginx/nginx-ssl.conf +++ b/serv_nginx/nginx/nginx-ssl.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name yalarba.ru www.yalarba.ru valitovgaziz.ru www.valitovgaziz.ru easysite102.ru www.easysite102.ru; + server_name yalarba.ru www.yalarba.ru valitovgaziz.ru www.valitovgaziz.ru easysite102.ru www.easysite102.ru бегущийбашкир.рф; location /.well-known/acme-challenge/ { root /var/www/certbot; @@ -80,3 +80,23 @@ server { try_files $uri $uri/ /index.html; } } + + +server { + listen 443 ssl; + server_name бегущийбашкир.рф www.бегущийбашкир.рф; + + ssl_certificate /etc/letsencrypt/live/бегущийбашкир.рф/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/бегущийбашкир.рф/privkey.pem; + + # Те же SSL настройки + ssl_protocols TLSv1.2 TLSv1.3; + ssl_prefer_server_ciphers on; + ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; + + location / { + root /usr/share/nginx/бегущийбашкир.рф/html; + index index.html; + try_files $uri $uri/ /index.html; + } +} diff --git a/serv_nginx/nginx/switch-config.sh b/serv_nginx/nginx/switch-config.sh index 05b119d..19fe94f 100644 --- a/serv_nginx/nginx/switch-config.sh +++ b/serv_nginx/nginx/switch-config.sh @@ -4,7 +4,8 @@ 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" ]; then + [ -f "/etc/letsencrypt/live/valitovgaziz.ru/fullchain.pem" ] || \ + [ -f "/etc/letsencrypt/live/бегущийбашкир.рф/fullchain.pem"]; then echo "SSL certificates found for at least one domain, switching to HTTPS configuration" ln -sf /etc/nginx/nginx-ssl.conf /etc/nginx/conf.d/default.conf else diff --git a/serv_nginx/stubSite/index.html b/serv_nginx/stubSite/index.html new file mode 100644 index 0000000..e69de29