projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17750: Update nginx/ssl example pillars and states
[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 53854308498dc0395160593e907db4156bad6027..be18c4da2818a5fb756f80ef48321ea4f9e6d573 100644
(file)
--- a/
test/salt/pillar/examples/nginx_keepweb_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_keepweb_configuration.sls
@@
-33,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
@@
-53,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