Add copyright headers to comply with Arvados

[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..5c228bada0c87b6d9031789986a959d2dfeeff43 100644 (file)
--- a/test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/test/salt/pillar/examples/nginx_websocket_configuration.sls
@@ -1,5 +1,7 @@
 ---
-{% set nginx_log = '/var/log/nginx' %}
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
 ### NGINX
 nginx:
@@ -9,17 +11,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,30 +29,32 @@ 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
             - 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
             - 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