projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17177-use-newly-created-ca'
[arvados.git]
/
tools
/
salt-install
/
single_host
/
nginx_keepweb_configuration.sls
diff --git
a/tools/salt-install/single_host/nginx_keepweb_configuration.sls
b/tools/salt-install/single_host/nginx_keepweb_configuration.sls
index bd0a636b0ecb526569b7d807d5608dc7de514af1..cc871b9da14af308163348d85b4a0afe69b6be24 100644
(file)
--- a/
tools/salt-install/single_host/nginx_keepweb_configuration.sls
+++ b/
tools/salt-install/single_host/nginx_keepweb_configuration.sls
@@
-11,7
+11,7
@@
nginx:
### STREAMS
http:
upstream collections_downloads_upstream:
### STREAMS
http:
upstream collections_downloads_upstream:
- - server: '
127.0.0.2
:9002 fail_timeout=10s'
+ - server: '
collections.internal
:9002 fail_timeout=10s'
servers:
managed:
servers:
managed:
@@
-52,7
+52,6
@@
nginx:
- client_max_body_size: 0
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- client_max_body_size: 0
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- # - include: 'snippets/letsencrypt.conf'
- - include: 'snippets/snakeoil.conf'
+ - include: 'snippets/arvados-snakeoil.conf'
- access_log: /var/log/nginx/collections.__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/collections.__CLUSTER__.__DOMAIN__.error.log
- access_log: /var/log/nginx/collections.__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/collections.__CLUSTER__.__DOMAIN__.error.log