19126: Merge branch 'main' into 19126-nginx-proxy-settings-change

[arvados.git] / sdk / python / tests / nginx.conf

diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index 25a6f2096dcb87c2b0505da08d65a8968d5c2cce..7fe55259f6bce4cf03da6dbe6108451b632eefad 100644 (file)
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -30,6 +30,8 @@ http {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
+      proxy_request_buffering off;
+      proxy_max_temp_file_size 0;
     }
   }
   upstream arv-git-http {
@@ -63,6 +65,7 @@ http {
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
 
+      client_max_body_size 67108864;
       proxy_http_version 1.1;
       proxy_request_buffering off;
     }
@@ -157,18 +160,20 @@ http {
       proxy_redirect off;
     }
   }
+  upstream workbench2 {
+    server {{LISTENHOST}}:{{WORKBENCH2PORT}};
+  }
   server {
     listen {{LISTENHOST}}:{{WORKBENCH2SSLPORT}} ssl;
     server_name workbench2 workbench2.*;
     ssl_certificate "{{SSLCERT}}";
     ssl_certificate_key "{{SSLKEY}}";
-    location /config.json {
-      return 200 '{ "API_HOST": "{{ARVADOS_API_HOST}}" }';
-    }
     location / {
-      root      /var/lib/arvados/workbench2;
-      index     index.html;
-      try_files $uri $uri/ /index.html;
+      proxy_pass http://workbench2;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto https;
+      proxy_redirect off;
     }
   }
 }