projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18631-shell-login-sync'
[arvados-formula.git]
/
test
/
salt
/
pillar
/
examples
/
nginx_keepweb_configuration.sls
diff --git
a/test/salt/pillar/examples/nginx_keepweb_configuration.sls
b/test/salt/pillar/examples/nginx_keepweb_configuration.sls
index dfb02f64230292dfc7512bc28aa02d2e0110eb49..be18c4da2818a5fb756f80ef48321ea4f9e6d573 100644
(file)
--- a/
test/salt/pillar/examples/nginx_keepweb_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_keepweb_configuration.sls
@@
-1,4
+1,8
@@
---
---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
### NGINX
nginx:
### SERVER
### NGINX
nginx:
### SERVER
@@
-7,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:
@@
-29,6
+33,8
@@
nginx:
arvados_collections_download_ssl.conf:
enabled: true
overwrite: true
arvados_collections_download_ssl.conf:
enabled: true
overwrite: true
+ requires:
+ file: nginx_snippet_arvados-snakeoil.conf
config:
- server:
- server_name: collections.fixme.example.net download.fixme.example.net
config:
- server:
- server_name: collections.fixme.example.net download.fixme.example.net
@@
-49,7
+55,6
@@
nginx:
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- include: 'snippets/ssl_hardening_default.conf'
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- include: 'snippets/ssl_hardening_default.conf'
- # - include: 'snippets/letsencrypt.conf'
- - include: 'snippets/ssl_snakeoil.conf'
+ - include: 'snippets/arvados-snakeoil.conf'
- access_log: /var/log/nginx/collections.fixme.example.net.access.log combined
- error_log: /var/log/nginx/collections.fixme.example.net.error.log
- access_log: /var/log/nginx/collections.fixme.example.net.access.log combined
- error_log: /var/log/nginx/collections.fixme.example.net.error.log