17750: Update nginx/ssl example pillars and states

[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..20682bbf2edd4fc19e6a07b0abe2c88ccd1528d9 100644 (file)
--- a/test/salt/pillar/examples/nginx_websocket_configuration.sls
+++ b/test/salt/pillar/examples/nginx_websocket_configuration.sls
@@ -1,4 +1,8 @@
 ---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 ### NGINX
 nginx:
   ### SERVER
@@ -7,12 +11,12 @@ nginx:
       ### STREAMS
       http:
         upstream websocket_upstream:
-          - server: '127.0.0.2:8005 fail_timeout=10s'
+          - server: 'ws.internal:8005 fail_timeout=10s'
 
   servers:
     managed:
       ### DEFAULT
-      arvados_websocket_default:
+      arvados_websocket_default.conf:
         enabled: true
         overwrite: true
         config:
@@ -25,9 +29,11 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
-      arvados_websocket_ssl:
+      arvados_websocket_ssl.conf:
         enabled: true
         overwrite: true
+        requires:
+          file: nginx_snippet_arvados-snakeoil.conf
         config:
           - server:
             - server_name: ws.fixme.example.net
@@ -49,7 +55,7 @@ nginx:
             - client_max_body_size: 64M
             - proxy_http_version: '1.1'
             - proxy_request_buffering: 'off'
-            # - include: 'snippets/letsencrypt.conf'
-            - include: 'snippets/snakeoil.conf'
+            - include: 'snippets/ssl_hardening_default.conf'
+            - include: 'snippets/arvados-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