Merge remote changes and resolve conflicts

docker/nginx/conf.d/default.conf

@@ -3,7 +3,6 @@ server {
     listen [::]:80;
     server_name itformhelp.ru www.itformhelp.ru;
     
-    # Для Let's Encrypt
     location /.well-known/acme-challenge/ {
         allow all;
         root /var/www/html;
@@ -13,10 +12,8 @@ server {
         root /usr/share/nginx/html;
         index index.html;
         try_files $uri $uri/ /index.html;
-        expires -1;
-        add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
-    
+
     location /api/ {
         proxy_pass http://backend:8000/api/;
         proxy_http_version 1.1;
@@ -24,8 +21,5 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_connect_timeout 60s;
-        proxy_send_timeout 60s;
-        proxy_read_timeout 60s;
     }
 }