projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13501-subprocess32'
[arvados.git]
/
sdk
/
python
/
tests
/
nginx.conf
diff --git
a/sdk/python/tests/nginx.conf
b/sdk/python/tests/nginx.conf
index bda67e630b602e240ce3999ce7832c9015b7323e..ce1929fdf710b5960df392cfe348016b4309becb 100644
(file)
--- a/
sdk/python/tests/nginx.conf
+++ b/
sdk/python/tests/nginx.conf
@@
-3,11
+3,11
@@
# SPDX-License-Identifier: Apache-2.0
daemon off;
# 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 {
events {
}
http {
- access_log
{{ACCESSLOG}}
combined;
+ access_log
"{{ACCESSLOG}}"
combined;
client_body_temp_path "{{TMPDIR}}";
upstream arv-git-http {
server localhost:{{GITPORT}};
client_body_temp_path "{{TMPDIR}}";
upstream arv-git-http {
server localhost:{{GITPORT}};
@@
-15,8
+15,8
@@
http {
server {
listen *:{{GITSSLPORT}} ssl default_server;
server_name _;
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;
}
location / {
proxy_pass http://arv-git-http;
}
@@
-27,8
+27,8
@@
http {
server {
listen *:{{KEEPPROXYSSLPORT}} ssl default_server;
server_name _;
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;
}
location / {
proxy_pass http://keepproxy;
}
@@
-39,8
+39,8
@@
http {
server {
listen *:{{KEEPWEBSSLPORT}} ssl default_server;
server_name ~^(?<request_host>.*)$;
server {
listen *:{{KEEPWEBSSLPORT}} ssl default_server;
server_name ~^(?<request_host>.*)$;
- 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}};
location / {
proxy_pass http://keep-web;
proxy_set_header Host $request_host:{{KEEPWEBPORT}};
@@
-50,8
+50,8
@@
http {
server {
listen *:{{KEEPWEBDLSSLPORT}} ssl default_server;
server_name ~.*;
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}};
location / {
proxy_pass http://keep-web;
proxy_set_header Host download:{{KEEPWEBPORT}};
@@
-65,8
+65,8
@@
http {
server {
listen *:{{WSSPORT}} ssl default_server;
server_name ~^(?<request_host>.*)$;
server {
listen *:{{WSSPORT}} ssl default_server;
server_name ~^(?<request_host>.*)$;
- 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;
location / {
proxy_pass http://ws;
proxy_set_header Upgrade $http_upgrade;
@@
-81,8
+81,8
@@
http {
server {
listen *:{{CONTROLLERSSLPORT}} ssl default_server;
server_name _;
server {
listen *:{{CONTROLLERSSLPORT}} ssl default_server;
server_name _;
- ssl_certificate
{{SSLCERT}}
;
- ssl_certificate_key
{{SSLKEY}}
;
+ ssl_certificate
"{{SSLCERT}}"
;
+ ssl_certificate_key
"{{SSLKEY}}"
;
location / {
proxy_pass http://controller;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
location / {
proxy_pass http://controller;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;