X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0561bd0c3c07257fd58ded6c7cfa5feeae97af57..688319dca9cbbb27452a0062943bb38b6935254e:/sdk/python/tests/nginx.conf diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf index 780968cb8b..ce1929fdf7 100644 --- a/sdk/python/tests/nginx.conf +++ b/sdk/python/tests/nginx.conf @@ -3,19 +3,20 @@ # SPDX-License-Identifier: Apache-2.0 daemon off; -error_log stderr info; # Yes, must be specified here _and_ cmdline +error_log "{{ERRORLOG}}" info; # Yes, must be specified here _and_ cmdline events { } http { - access_log {{ACCESSLOG}} combined; + access_log "{{ACCESSLOG}}" combined; + client_body_temp_path "{{TMPDIR}}"; upstream arv-git-http { server localhost:{{GITPORT}}; } server { listen *:{{GITSSLPORT}} ssl default_server; server_name _; - ssl_certificate {{SSLCERT}}; - ssl_certificate_key {{SSLKEY}}; + ssl_certificate "{{SSLCERT}}"; + ssl_certificate_key "{{SSLKEY}}"; location / { proxy_pass http://arv-git-http; } @@ -26,8 +27,8 @@ http { server { listen *:{{KEEPPROXYSSLPORT}} ssl default_server; server_name _; - ssl_certificate {{SSLCERT}}; - ssl_certificate_key {{SSLKEY}}; + ssl_certificate "{{SSLCERT}}"; + ssl_certificate_key "{{SSLKEY}}"; location / { proxy_pass http://keepproxy; } @@ -38,8 +39,8 @@ http { server { listen *:{{KEEPWEBSSLPORT}} ssl default_server; server_name ~^(?.*)$; - ssl_certificate {{SSLCERT}}; - ssl_certificate_key {{SSLKEY}}; + ssl_certificate "{{SSLCERT}}"; + ssl_certificate_key "{{SSLKEY}}"; location / { proxy_pass http://keep-web; proxy_set_header Host $request_host:{{KEEPWEBPORT}}; @@ -49,8 +50,8 @@ http { server { listen *:{{KEEPWEBDLSSLPORT}} ssl default_server; server_name ~.*; - ssl_certificate {{SSLCERT}}; - ssl_certificate_key {{SSLKEY}}; + ssl_certificate "{{SSLCERT}}"; + ssl_certificate_key "{{SSLKEY}}"; location / { proxy_pass http://keep-web; proxy_set_header Host download:{{KEEPWEBPORT}}; @@ -64,8 +65,8 @@ http { server { listen *:{{WSSPORT}} ssl default_server; server_name ~^(?.*)$; - ssl_certificate {{SSLCERT}}; - ssl_certificate_key {{SSLKEY}}; + ssl_certificate "{{SSLCERT}}"; + ssl_certificate_key "{{SSLKEY}}"; location / { proxy_pass http://ws; proxy_set_header Upgrade $http_upgrade; @@ -74,4 +75,17 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } } + upstream controller { + server localhost:{{CONTROLLERPORT}}; + } + server { + listen *:{{CONTROLLERSSLPORT}} ssl default_server; + server_name _; + ssl_certificate "{{SSLCERT}}"; + ssl_certificate_key "{{SSLKEY}}"; + location / { + proxy_pass http://controller; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + } }