Merge branch '20825-cwl-separate-runner' refs #20825

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

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_grafana_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_grafana_configuration.sls
index e306dbd0c741df280c0d10e5da569a1a024491ed..9e1d72615012d12c1836dedd41a1cf41babba8d0 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_grafana_configuration.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_grafana_configuration.sls
@@ -24,7 +24,7 @@ nginx:
         overwrite: true
         config:
           - server:
-            - server_name: grafana.__CLUSTER__.__DOMAIN__
+            - server_name: grafana.__DOMAIN__
             - listen:
               - 80
             - location /.well-known:
@@ -39,7 +39,7 @@ nginx:
           __CERT_REQUIRES__
         config:
           - server:
-            - server_name: grafana.__CLUSTER__.__DOMAIN__
+            - server_name: grafana.__DOMAIN__
             - listen:
               - 443 http2 ssl
             - index: index.html index.htm
@@ -58,5 +58,5 @@ nginx:
             {%- 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/grafana.__CLUSTER__.__DOMAIN__.access.log combined
-            - error_log: /var/log/nginx/grafana.__CLUSTER__.__DOMAIN__.error.log
+            - access_log: /var/log/nginx/grafana.__DOMAIN__.access.log combined
+            - error_log: /var/log/nginx/grafana.__DOMAIN__.error.log