From 99ccb48ff7e0a715be4c0b8f637823a668ace05c Mon Sep 17 00:00:00 2001
From: HypoxiE <kosmaer42@gmail.com>
Date: Wed, 27 Aug 2025 21:54:23 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D1=82=D0=B8=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml |  3 ++-
 nginx.conf         | 21 +++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

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;