17750: Update nginx/ssl example pillars and states

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

diff --git a/test/salt/pillar/examples/nginx_keepweb_configuration.sls b/test/salt/pillar/examples/nginx_keepweb_configuration.sls
index 42a72406546f42bc3165ef1b3aa241eba072af21..be18c4da2818a5fb756f80ef48321ea4f9e6d573 100644 (file)
--- a/test/salt/pillar/examples/nginx_keepweb_configuration.sls
+++ b/test/salt/pillar/examples/nginx_keepweb_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 collections_downloads_upstream:
-          - server: '127.0.0.1:9002 fail_timeout=10s'
+          - server: 'collections.internal:9002 fail_timeout=10s'
 
   servers:
     managed:
       ### DEFAULT
-      arvados_collections_default:
+      arvados_collections_download_default.conf:
         enabled: true
         overwrite: true
         config:
           - server:
-            - server_name: collections.example.net download.example.net
+            - server_name: collections.fixme.example.net download.fixme.example.net
             - listen:
               - 80
             - location /.well-known:
@@ -28,12 +30,14 @@ nginx:
               - return: '301 https://$host$request_uri'
 
       ### COLLECTIONS / DOWNLOAD
-      arvados_collections_downloads:
+      arvados_collections_download_ssl.conf:
         enabled: true
         overwrite: true
+        requires:
+          file: nginx_snippet_arvados-snakeoil.conf
         config:
           - server:
-            - server_name: collections.example.net download.example.net
+            - server_name: collections.fixme.example.net download.fixme.example.net
             - listen:
               - 443 http2 ssl
             - index: index.html index.htm
@@ -50,7 +54,7 @@ nginx:
             - client_max_body_size: 0
             - proxy_http_version: '1.1'
             - proxy_request_buffering: 'off'
-            # - include: 'snippets/letsencrypt.conf'
-            - include: 'snippets/snakeoil.conf'
-            - access_log: {{ nginx_log }}/collections.example.net.access.log combined
-            - error_log: {{ nginx_log }}/collections.example.net.error.log
+            - include: 'snippets/ssl_hardening_default.conf'
+            - include: 'snippets/arvados-snakeoil.conf'
+            - access_log: /var/log/nginx/collections.fixme.example.net.access.log combined
+            - error_log: /var/log/nginx/collections.fixme.example.net.error.log