Merge remote changes and resolve conflicts

docker/nginx/conf.d/default.conf

@@ -1,46 +1,31 @@
-# Redirect HTTP to HTTPS
+# docker/nginx/conf.d/default.conf
 server {
     listen 80;
     listen [::]:80;
     server_name itformhelp.ru www.itformhelp.ru;
     
-    # Allow certbot auth challenge
-    location /.well-known/acme-challenge/ {
+    location ~ /.well-known/acme-challenge {
+        allow all;
         root /var/www/html;
     }
 
-    # Redirect all other traffic to HTTPS
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-# HTTPS server
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name itformhelp.ru www.itformhelp.ru;
-
-    # SSL configuration
-    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;
-
-    # Frontend
     location / {
+        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";
     }
 
-    # Backend API
     location /api/ {
-        proxy_pass http://backend:8000;
+        proxy_pass http://backend:8000/api/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         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;
     }
 }