projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20877-trashed-priority' refs #20877
[arvados.git]
/
sdk
/
python
/
tests
/
nginx.conf
diff --git
a/sdk/python/tests/nginx.conf
b/sdk/python/tests/nginx.conf
index 25a6f2096dcb87c2b0505da08d65a8968d5c2cce..1716291fe828c3ec824b2b0cc56206de5fde3371 100644
(file)
--- 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}}";
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 {
upstream controller {
- server {{
LISTEN
HOST}}:{{CONTROLLERPORT}};
+ server {{
UPSTREAM
HOST}}:{{CONTROLLERPORT}};
}
server {
listen {{LISTENHOST}}:{{CONTROLLERSSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{CONTROLLERSSLPORT}} ssl;
@@
-26,14
+33,21
@@
http {
client_max_body_size 0;
location / {
proxy_pass http://controller;
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 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_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 {
}
}
upstream arv-git-http {
- server {{
LISTEN
HOST}}:{{GITPORT}};
+ server {{
UPSTREAM
HOST}}:{{GITPORT}};
}
server {
listen {{LISTENHOST}}:{{GITSSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{GITSSLPORT}} ssl;
@@
-49,7
+63,7
@@
http {
}
}
upstream keepproxy {
}
}
upstream keepproxy {
- server {{
LISTEN
HOST}}:{{KEEPPROXYPORT}};
+ server {{
UPSTREAM
HOST}}:{{KEEPPROXYPORT}};
}
server {
listen {{LISTENHOST}}:{{KEEPPROXYSSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{KEEPPROXYSSLPORT}} ssl;
@@
-63,12
+77,13
@@
http {
proxy_set_header X-Forwarded-Proto https;
proxy_redirect off;
proxy_set_header X-Forwarded-Proto https;
proxy_redirect off;
+ client_max_body_size 67108864;
proxy_http_version 1.1;
proxy_request_buffering off;
}
}
upstream keep-web {
proxy_http_version 1.1;
proxy_request_buffering off;
}
}
upstream keep-web {
- server {{
LISTEN
HOST}}:{{KEEPWEBPORT}};
+ server {{
UPSTREAM
HOST}}:{{KEEPWEBPORT}};
}
server {
listen {{LISTENHOST}}:{{KEEPWEBSSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{KEEPWEBSSLPORT}} ssl;
@@
-88,7
+103,7
@@
http {
}
}
upstream health {
}
}
upstream health {
- server {{
LISTEN
HOST}}:{{HEALTHPORT}};
+ server {{
UPSTREAM
HOST}}:{{HEALTHPORT}};
}
server {
listen {{LISTENHOST}}:{{HEALTHSSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{HEALTHSSLPORT}} ssl;
@@
-124,7
+139,7
@@
http {
}
}
upstream ws {
}
}
upstream ws {
- server {{
LISTEN
HOST}}:{{WSPORT}};
+ server {{
UPSTREAM
HOST}}:{{WSPORT}};
}
server {
listen {{LISTENHOST}}:{{WSSSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{WSSSLPORT}} ssl;
@@
-139,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;
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 {
}
}
upstream workbench1 {
- server {{
LISTEN
HOST}}:{{WORKBENCH1PORT}};
+ server {{
UPSTREAM
HOST}}:{{WORKBENCH1PORT}};
}
server {
listen {{LISTENHOST}}:{{WORKBENCH1SSLPORT}} ssl;
}
server {
listen {{LISTENHOST}}:{{WORKBENCH1SSLPORT}} ssl;
@@
-157,18
+176,20
@@
http {
proxy_redirect off;
}
}
proxy_redirect off;
}
}
+ upstream workbench2 {
+ server {{UPSTREAMHOST}}:{{WORKBENCH2PORT}};
+ }
server {
listen {{LISTENHOST}}:{{WORKBENCH2SSLPORT}} ssl;
server_name workbench2 workbench2.*;
ssl_certificate "{{SSLCERT}}";
ssl_certificate_key "{{SSLKEY}}";
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 / {
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;
}
}
}
}
}
}