X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b53513423ab948804425424278ac554870864997..032ecb480134f6138346865fba7732a836b809c6:/sdk/python/tests/nginx.conf diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf index 4d1e06613a..1716291fe8 100644 --- a/sdk/python/tests/nginx.conf +++ b/sdk/python/tests/nginx.conf @@ -15,8 +15,15 @@ http { fastcgi_temp_path "{{TMPDIR}}"; uwsgi_temp_path "{{TMPDIR}}"; scgi_temp_path "{{TMPDIR}}"; + geo $external_client { + default 1; + 127.0.0.0/8 0; + ::1 0; + fd00::/8 0; + {{INTERNALSUBNETS}} + } upstream controller { - server {{LISTENHOST}}:{{CONTROLLERPORT}}; + server {{UPSTREAMHOST}}:{{CONTROLLERPORT}}; } server { listen {{LISTENHOST}}:{{CONTROLLERSSLPORT}} ssl; @@ -26,14 +33,21 @@ http { client_max_body_size 0; location / { proxy_pass http://controller; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; + proxy_set_header X-External-Client $external_client; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_redirect off; + proxy_max_temp_file_size 0; + proxy_request_buffering off; + proxy_buffering off; + proxy_http_version 1.1; } } upstream arv-git-http { - server {{LISTENHOST}}:{{GITPORT}}; + server {{UPSTREAMHOST}}:{{GITPORT}}; } server { listen {{LISTENHOST}}:{{GITSSLPORT}} ssl; @@ -49,7 +63,7 @@ http { } } upstream keepproxy { - server {{LISTENHOST}}:{{KEEPPROXYPORT}}; + server {{UPSTREAMHOST}}:{{KEEPPROXYPORT}}; } server { listen {{LISTENHOST}}:{{KEEPPROXYSSLPORT}} ssl; @@ -69,7 +83,7 @@ http { } } upstream keep-web { - server {{LISTENHOST}}:{{KEEPWEBPORT}}; + server {{UPSTREAMHOST}}:{{KEEPWEBPORT}}; } server { listen {{LISTENHOST}}:{{KEEPWEBSSLPORT}} ssl; @@ -89,7 +103,7 @@ http { } } upstream health { - server {{LISTENHOST}}:{{HEALTHPORT}}; + server {{UPSTREAMHOST}}:{{HEALTHPORT}}; } server { listen {{LISTENHOST}}:{{HEALTHSSLPORT}} ssl; @@ -125,7 +139,7 @@ http { } } upstream ws { - server {{LISTENHOST}}:{{WSPORT}}; + server {{UPSTREAMHOST}}:{{WSPORT}}; } server { listen {{LISTENHOST}}:{{WSSSLPORT}} ssl; @@ -140,10 +154,14 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_redirect off; + + client_max_body_size 0; + proxy_http_version 1.1; + proxy_request_buffering off; } } upstream workbench1 { - server {{LISTENHOST}}:{{WORKBENCH1PORT}}; + server {{UPSTREAMHOST}}:{{WORKBENCH1PORT}}; } server { listen {{LISTENHOST}}:{{WORKBENCH1SSLPORT}} ssl; @@ -159,7 +177,7 @@ http { } } upstream workbench2 { - server {{LISTENHOST}}:{{WORKBENCH2PORT}}; + server {{UPSTREAMHOST}}:{{WORKBENCH2PORT}}; } server { listen {{LISTENHOST}}:{{WORKBENCH2SSLPORT}} ssl;