projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat(components,version): add extra components, new version
[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 bc198e16de73692a25b965a25fde14b9542b30a0..01b77888a2af1afc19f3555dfce8e9a2d512da1b 100644
(file)
--- a/
test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_websocket_configuration.sls
@@
-1,6
+1,4
@@
---
---
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
### SERVER
### NGINX
nginx:
### SERVER
@@
-9,7
+7,7
@@
nginx:
### STREAMS
http:
upstream websocket_upstream:
### STREAMS
http:
upstream websocket_upstream:
- - server: '127.0.0.
1
:8005 fail_timeout=10s'
+ - server: '127.0.0.
2
:8005 fail_timeout=10s'
servers:
managed:
servers:
managed:
@@
-19,7
+17,7
@@
nginx:
overwrite: true
config:
- server:
overwrite: true
config:
- server:
- - server_name: ws.example.net
+ - server_name: ws.
fixme.
example.net
- listen:
- 80
- location /.well-known:
- listen:
- 80
- location /.well-known:
@@
-32,18
+30,19
@@
nginx:
overwrite: true
config:
- server:
overwrite: true
config:
- server:
- - server_name: ws.example.net
+ - server_name: ws.
fixme.
example.net
- listen:
- 443 http2 ssl
- index: index.html index.htm
- location /:
- proxy_pass: 'http://websocket_upstream'
- listen:
- 443 http2 ssl
- index: index.html index.htm
- location /:
- proxy_pass: 'http://websocket_upstream'
- - proxy_read_timeout:
9
0
+ - proxy_read_timeout:
60
0
- proxy_connect_timeout: 90
- proxy_redirect: 'off'
- proxy_connect_timeout: 90
- proxy_redirect: 'off'
- - proxy_set_header: X-Forwarded-Proto https
- - proxy_set_header: 'Host $http_host'
+ - proxy_set_header: 'Host $host'
- proxy_set_header: 'X-Real-IP $remote_addr'
- proxy_set_header: 'X-Real-IP $remote_addr'
+ - proxy_set_header: 'Upgrade $http_upgrade'
+ - proxy_set_header: 'Connection "upgrade"'
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
- proxy_buffering: 'off'
- client_body_buffer_size: 64M
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
- proxy_buffering: 'off'
- client_body_buffer_size: 64M
@@
-52,5
+51,5
@@
nginx:
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log:
{{ nginx_log }}/ws
.example.net.access.log combined
- - error_log:
{{ nginx_log }}/ws
.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