feat(distro): add centos-7 support

[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 d7e75c9328b8cda2f99efd2a673fcaf3751a0d89..48e9db26c8e8d496088306d180ced0f4410ea708 100644 (file)
--- a/test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/test/salt/pillar/examples/nginx_websocket_configuration.sls
@@ -12,7 +12,7 @@ nginx:
   servers:
     managed:
       ### DEFAULT
   servers:
     managed:
       ### DEFAULT

-      arvados_websocket_default:
+      arvados_websocket_default.conf:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:


@@ -25,7 +25,7 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
             - location /:
               - return: '301 https://$host$request_uri'
 

-      arvados_websocket_ssl:
+      arvados_websocket_ssl.conf:

         enabled: true
         overwrite: true
         config:
         enabled: true
         overwrite: true
         config:


@@ -49,7 +49,8 @@ nginx:
             - client_max_body_size: 64M
             - proxy_http_version: '1.1'
             - proxy_request_buffering: 'off'
             - client_max_body_size: 64M
             - proxy_http_version: '1.1'
             - proxy_request_buffering: 'off'

+            - include: 'snippets/ssl_hardening_default.conf'

             # - include: 'snippets/letsencrypt.conf'
             # - include: 'snippets/letsencrypt.conf'

-            - include: 'snippets/snakeoil.conf'
+            - include: 'snippets/ssl_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