X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/f1f4904bce70447c910b07ba8745f05be7e1d1ae..6c52de7c70c90784df58e6dbc6c43a71b9cc7e7c:/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 b6a2174..f50f40e 100644
--- 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
@@ -9,17 +7,17 @@ nginx:
       ### STREAMS
       http:
         upstream websocket_upstream:
-          - server: '127.0.0.1:8005 fail_timeout=10s'
+          - server: 'ws.internal:8005 fail_timeout=10s'
 
   servers:
     managed:
       ### DEFAULT
-      arvados_ws_default:
+      arvados_websocket_default.conf:
         enabled: true
         overwrite: true
         config:
           - server:
-            - server_name: ws.example.net
+            - server_name: ws.fixme.example.net
             - listen:
               - 80
             - location /.well-known:
@@ -27,12 +25,12 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
-      arvados_websocket:
+      arvados_websocket_ssl.conf:
         enabled: true
         overwrite: true
         config:
           - server:
-            - server_name: ws.example.net
+            - server_name: ws.fixme.example.net
             - listen:
               - 443 http2 ssl
             - index: index.html index.htm
@@ -51,7 +49,8 @@ nginx:
             - 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/snakeoil.conf'
-            - access_log: {{ nginx_log }}/ws.example.net.access.log combined
-            - error_log: {{ nginx_log }}/ws.example.net.error.log
+            - 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