diff --git a/docker-compose.yml b/docker-compose.yml index 006f4d3..cde6b25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,4 +17,5 @@ services: - nginx_network_external volumes: - /etc/letsencrypt:/etc/letsencrypt:ro - - ./nginx.conf:/etc/nginx/nginx.conf:ro \ No newline at end of file + - ./nginx.conf:/etc/nginx/nginx.conf:ro + - /var/www/certbot:/usr/share/nginx/html/.well-known/acme-challenge:ro \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index ca9bbe7..3596428 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,25 +1,22 @@ events {} http { - server { - listen 80; - server_name j-v-web-panel.duckdns.org andrey-v-web-panel.duckdns.org hypoxie-v-web-panel.duckdns.org; - # Автоматический редирект на HTTPS - return 301 https://$server_name:442$request_uri; + server { + listen 80 + location /.well-known/acme-challenge/ { + root /usr/share/nginx/html; + } + location / { + return 301 https://$server_name:443$request_uri; + } } server { - listen 80; + listen 443; server_name hypoxie.duckdns.org; return 301 https://adoptapet.ru/cats/; } - server { - listen 80 default_server; - server_name _; # ловит все остальные домены - - return 301 https://adoptapet.ru/cats/; - } server { listen 443 ssl http2;