diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 686e78f..991f5a1 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -4,7 +4,6 @@ FROM certbot/certbot RUN mkdir -p /etc/letsencrypt/config # Копируем конфигурационные файлы -COPY config/certbot.ini /etc/letsencrypt/config/ COPY scripts/init-certbot.sh /opt/ # Устанавливаем права diff --git a/certbot/config/certbot.ini b/certbot/config/certbot.ini index adeb6eb..3bbe045 100644 --- a/certbot/config/certbot.ini +++ b/certbot/config/certbot.ini @@ -11,10 +11,7 @@ agree-tos = True non-interactive = True # Домены -domains = -yalarba.ru, -auth.yalarba.ru, -www.yalarba.ru +domains = yalarba.ru,auth.yalarba.ru,www.yalarba.ru # Путь для webroot-аутентификации webroot-path = /var/www/certbot diff --git a/docker-compose.yaml b/docker-compose.yaml index 6398a92..ac6eda4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -93,6 +93,7 @@ services: - prod - dev volumes: + - ./certbot/config:/etc/letsencrypt/config - certbot_data:/etc/letsencrypt - certbot_www:/var/www/certbot env_file: diff --git a/nginx/nginx-ssl.conf b/nginx/nginx-ssl.conf index a630fd8..e542045 100644 --- a/nginx/nginx-ssl.conf +++ b/nginx/nginx-ssl.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name yalarba.ru; + server_name yalarba.ru www.yalarba.ru auth.yalarba.ru; location /.well-known/acme-challenge/ { root /var/www/certbot;