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_websocket_configuration.sls
diff --git
a/test/salt/pillar/examples/nginx_websocket_configuration.sls
b/test/salt/pillar/examples/nginx_websocket_configuration.sls
index 5c228bada0c87b6d9031789986a959d2dfeeff43..20682bbf2edd4fc19e6a07b0abe2c88ccd1528d9 100644
(file)
--- a/
test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_websocket_configuration.sls
@@
-32,6
+32,8
@@
nginx:
arvados_websocket_ssl.conf:
enabled: true
overwrite: true
arvados_websocket_ssl.conf:
enabled: true
overwrite: true
+ requires:
+ file: nginx_snippet_arvados-snakeoil.conf
config:
- server:
- server_name: ws.fixme.example.net
config:
- server:
- server_name: ws.fixme.example.net
@@
-54,7
+56,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/ws.fixme.example.net.access.log combined
- error_log: /var/log/nginx/ws.fixme.example.net.error.log
- access_log: /var/log/nginx/ws.fixme.example.net.access.log combined
- error_log: /var/log/nginx/ws.fixme.example.net.error.log