X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b9a5ff791910fc8c49b02521c48a5bf25ccc4259..3a35c1dca48cf1470690be5c021046ac87faaa21:/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 b349ded328..1c10847f76 100644 --- 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 @@ -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 @@ -52,5 +52,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/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