20482: Allows the cluster operator to use an arbitrary domain.

[arvados.git] / tools / salt-install / config_examples / multi_host / aws / pillars / nginx_collections_configuration.sls

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_collections_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_collections_configuration.sls
index 1719b0a64c20fd5056f68f9616d152686ec267e5..1c10847f76a9b199894d45e70c0da3cda6dfb4a8 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_collections_configuration.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_collections_configuration.sls
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-{%- import_yaml "ssl_key_encrypted.sls" as imported %}
+{%- import_yaml "ssl_key_encrypted.sls" as ssl_key_encrypted_pillar %}
 
 ### NGINX
 nginx:
@@ -15,7 +15,7 @@ nginx:
         overwrite: true
         config:
           - server:
-            - server_name: '~^(.*\.)?collections\.__CLUSTER__\.__DOMAIN__'
+            - server_name: '~^(.*\.)?collections\.__DOMAIN__'
             - listen:
               - 80
             - location /:
@@ -29,7 +29,7 @@ nginx:
           __CERT_REQUIRES__
         config:
           - server:
-            - server_name: '~^(.*\.)?collections\.__CLUSTER__\.__DOMAIN__'
+            - server_name: '~^(.*\.)?collections\.__DOMAIN__'
             - listen:
               - __KEEPWEB_EXT_SSL_PORT__ http2 ssl
             - index: index.html index.htm
@@ -49,8 +49,8 @@ nginx:
             - include: snippets/ssl_hardening_default.conf
             - ssl_certificate: __CERT_PEM__
             - ssl_certificate_key: __CERT_KEY__
-            {%- if imported.ssl_key_encrypted.enabled %}
-            - ssl_password_file: {{ imported.ssl_key_encrypted.ssl_password_file }}
+            {%- if ssl_key_encrypted_pillar.ssl_key_encrypted.enabled %}
+            - ssl_password_file: {{ '/run/arvados/' | path_join(ssl_key_encrypted_pillar.ssl_key_encrypted.privkey_password_filename) }}
             {%- endif %}
-            - access_log: /var/log/nginx/collections.__CLUSTER__.__DOMAIN__.access.log combined
-            - error_log: /var/log/nginx/collections.__CLUSTER__.__DOMAIN__.error.log
+            - access_log: /var/log/nginx/collections.__DOMAIN__.access.log combined
+            - error_log: /var/log/nginx/collections.__DOMAIN__.error.log