From b7a43826ad766dbf5a5a750ae3397f4d0acbe488 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Wed, 25 Dec 2024 02:17:13 +0600
Subject: [PATCH] Merge remote changes and resolve conflicts

---
 docker/nginx/conf.d/default.conf | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index 41e432a..64e1129 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/docker/nginx/conf.d/default.conf
@@ -1,16 +1,7 @@
 server {
     listen 80;
     server_name itformhelp.ru www.itformhelp.ru;
-    return 301 https://$server_name$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name itformhelp.ru www.itformhelp.ru;
-
-    ssl_certificate /etc/letsencrypt/live/itformhelp.ru/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/itformhelp.ru/privkey.pem;
-
+    
     root /usr/share/nginx/html;
     index index.html;