resolve conflict

2026-06-02 14:42:51 -04:00
parent d847ff9476 f546adb1ca
commit 5511a717c6
3 changed files with 45 additions and 11 deletions
@@ -14,16 +14,6 @@ http {
    server {
        listen 80;

-        # Scan endpoints may run for several minutes on network shares.
-        location ~ ^/api/config(/rescan|/rescan-results)?$ {
-            proxy_pass http://backend;
-            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_read_timeout 600s;
-            proxy_send_timeout 600s;
-        }
-
        # Frontend (default)
        location / {
            proxy_pass http://frontend;
@@ -42,7 +32,8 @@ http {
            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_read_timeout 60s;
+            proxy_read_timeout 600s;
+            proxy_send_timeout 600s;
        }
    }
 }