diff --git a/serv_nginx/.env b/serv_nginx/.env index 01d76cc..77cf5e7 100644 --- a/serv_nginx/.env +++ b/serv_nginx/.env @@ -5,4 +5,5 @@ DOMAINS_yalarba=yalarba.ru,www.yalarba.ru DOMAINS_valitovgaziz=valitovgaziz.ru,www.valitovgaziz.ru DOMAINS_easysite102=easysite102.ru,www.easysite102.ru DOMAINS_begushiybashkir=xn--80abahjtcfl5d0a8di.xn--p1ai,www.xn--80abahjtcfl5d0a8di.xn--p1ai +DOAMINS_DOMAINS_begushiybashkir_latin=begushiybashkir.ru,www.begushiybashkir.ru ALL_DOMAINS=yalarba.ru,www.yalarba.ru,valitovgaziz.ru,www.valitovgaziz.ru,easysite102.ru,www.easysite102.ru \ No newline at end of file diff --git a/serv_nginx/certbot/scripts/init-certbot.sh b/serv_nginx/certbot/scripts/init-certbot.sh index a1ba83f..40cf394 100644 --- a/serv_nginx/certbot/scripts/init-certbot.sh +++ b/serv_nginx/certbot/scripts/init-certbot.sh @@ -33,7 +33,7 @@ fi echo "sertificates for ${DOMAINS_easysite102} is ready" -# Проверяем наличие сертификатов для easysite102.ru +# Проверяем наличие сертификатов для бегущийбашкир.рф if [ ! -d "/etc/letsencrypt/live/xn--80abahjtcfl5d0a8di.xn--p1ai" ]; then echo "Получаем новые сертификаты ${DOMAINS_begushiybashkir} ..." certbot certonly --webroot \ @@ -44,6 +44,17 @@ fi echo "sertificates for ${DOMAINS_begushiybashkir} is ready" +# Проверяем наличие сертификатов для begushiybashkir.ru +if [ ! -d "/etc/letsencrypt/live/begushiybashkir.ru" ]; then + echo "Получаем новые сертификаты ${DOMAINS_begushiybashkir_latin} ..." + certbot certonly --webroot \ + --config /etc/letsencrypt/config/certbot.ini \ + -w /var/www/certbot \ + -d ${DOMAINS_begushiybashkir_latin} +fi + +echo "sertificates for ${DOMAINS_begushiybashkir_latin} is ready" + set -e # Завершаем работу, если любая команда вернёт ошибку # Активируем сервис cron diff --git a/serv_nginx/certbot/scripts/renewBegushiyBAshkirLatin.sh b/serv_nginx/certbot/scripts/renewBegushiyBAshkirLatin.sh new file mode 100644 index 0000000..d9e2f9b --- /dev/null +++ b/serv_nginx/certbot/scripts/renewBegushiyBAshkirLatin.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +echo "Получаем новые сертификаты для ${DOMAINS_begushiybashkir_latin}..." +certbot certonly --webroot \ + --config /etc/letsencrypt/config/certbot.ini \ + -w /var/www/certbot \ + -d ${DOMAINS_begushiybashkir_latin} \ No newline at end of file diff --git a/serv_nginx/nginx/nginx-ssl.conf b/serv_nginx/nginx/nginx-ssl.conf index 032cb89..adf01a6 100644 --- a/serv_nginx/nginx/nginx-ssl.conf +++ b/serv_nginx/nginx/nginx-ssl.conf @@ -100,3 +100,22 @@ server { try_files $uri $uri/ /index.html; } } + +server { + listen 443 ssl; + server_name begushiybashkir.ru www.begushiybashkir.ru; + + ssl_certificate /etc/letsencrypt/live/begushiybashkir.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/begushiybashkir.ru/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/begushiybashkir/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 ca42fa1..7c3eccd 100644 --- a/serv_nginx/nginx/switch-config.sh +++ b/serv_nginx/nginx/switch-config.sh @@ -5,6 +5,7 @@ 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