Merge pull request #2 from netmanagers/master

fix(init.sls): enable all states

diff --git a/arvados/init.sls b/arvados/init.sls
index 7f14f19365e3cd95bd5c3c2bbc970c857ee93d2d..ad7fdbb5f7b8b1bcf823ddf8a40e724be6cc6828 100644 (file)
--- a/arvados/init.sls
+++ b/arvados/init.sls
@@ -3,12 +3,12 @@
 
 include:
   - .repo
-  #- .config
-  #- .api
-  #- .keepstore
-  #- .websocket
-  #- .keepweb
-  #- .workbench2
-  #- .keepproxy
-  #- .shell
-  #- .workbench
+  - .config
+  - .api
+  - .keepstore
+  - .websocket
+  - .keepweb
+  - .workbench2
+  - .keepproxy
+  - .shell
+  - .workbench

diff --git a/test/salt/pillar/examples/nginx_websocket_configuration.sls b/test/salt/pillar/examples/nginx_websocket_configuration.sls
index bc198e16de73692a25b965a25fde14b9542b30a0..b6a217463e94382dabb5fdf676092a6285c7de98 100644 (file)
--- a/test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/test/salt/pillar/examples/nginx_websocket_configuration.sls
@@ -38,12 +38,13 @@ nginx:
             - index: index.html index.htm
             - location /:
               - proxy_pass: 'http://websocket_upstream'
-              - proxy_read_timeout: 90
+              - proxy_read_timeout: 600
               - 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: '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