17750: Update nginx/ssl example pillars and states

[arvados-formula.git] / test / salt / pillar / examples / nginx_workbench_configuration.sls

diff --git a/test/salt/pillar/examples/nginx_workbench_configuration.sls b/test/salt/pillar/examples/nginx_workbench_configuration.sls
index e34ad2dc329bf7d8a3eb51444f9792fbd428ff6e..37fa31c170efeb60debfdde3d707a0037768389f 100644 (file)
--- a/test/salt/pillar/examples/nginx_workbench_configuration.sls
+++ b/test/salt/pillar/examples/nginx_workbench_configuration.sls
@@ -1,4 +1,8 @@
 ---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 {%- if grains.os_family in ('RedHat',) %}
   {%- set group = 'nginx' %}
 {%- else %}
@@ -32,18 +36,18 @@ nginx:
       arvados_workbench_ssl.conf:
         enabled: true
         overwrite: true
+        requires:
+          file: nginx_snippet_arvados-snakeoil.conf
         config:
           - server:
             - server_name: workbench.fixme.example.net
             - listen:
               - 443 http2 ssl
-            - index: index.html index.htm
-            - location /:
             - root: /var/www/arvados-workbench/current/public
             - passenger_enabled: 'on'
+            - index: index.html index.htm
             - include: 'snippets/ssl_hardening_default.conf'
-            # - include: 'snippets/letsencrypt.conf'
-            - include: 'snippets/ssl_snakeoil.conf'
+            - include: 'snippets/arvados-snakeoil.conf'
             # yamllint disable-line rule:line-length
             - access_log: /var/log/nginx/workbench.fixme.example.net.access.log combined
             - error_log: /var/log/nginx/workbench.fixme.example.net.error.log