X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/06050e0a5377d3d6a4c54c7f50fe53a06a07c837..aea99ea5eafb8d2256a6441a72021eaf9db7cbb2:/test/salt/pillar/examples/nginx_keepproxy_configuration.sls

diff --git a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls b/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
index 3de312a..d9ed0c6 100644
--- a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
+++ b/test/salt/pillar/examples/nginx_keepproxy_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 keepproxy_upstream:
-          - server: '127.0.0.1:25107 fail_timeout=10s'
+          - server: 'keep.internal:25100 fail_timeout=10s'
 
   servers:
     managed:
       ### DEFAULT
-      arvados_keep_default:
+      arvados_keepproxy_default.conf:
         enabled: true
         overwrite: true
         config:
           - server:
-            - server_name: keep.example.net
+            - server_name: keep.fixme.example.net
             - listen:
               - 80
             - location /.well-known:
@@ -27,12 +29,14 @@ nginx:
             - location /:
               - return: '301 https://$host$request_uri'
 
-      arvados_keepproxy:
+      arvados_keepproxy_ssl.conf:
         enabled: true
         overwrite: true
+        requires:
+          file: nginx_snippet_arvados-snakeoil.conf
         config:
           - server:
-            - server_name: keep.example.net
+            - server_name: keep.fixme.example.net
             - listen:
               - 443 http2 ssl
             - index: index.html index.htm
@@ -50,7 +54,7 @@ nginx:
             - client_max_body_size: 64M
             - proxy_http_version: '1.1'
             - proxy_request_buffering: 'off'
-            # - include: 'snippets/letsencrypt.conf'
-            - include: 'snippets/snakeoil.conf'
-            - access_log: {{ nginx_log }}/keepproxy.example.net.access.log combined
-            - error_log: {{ nginx_log }}/keepproxy.example.net.error.log
+            - include: 'snippets/ssl_hardening_default.conf'
+            - include: 'snippets/arvados-snakeoil.conf'
+            - access_log: /var/log/nginx/keepproxy.fixme.example.net.access.log combined
+            - error_log: /var/log/nginx/keepproxy.fixme.example.net.error.log