X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9539317a22d8ea16f94b0e086507ab595d758216..bfe0ea9b824dc057f07355a928ccb64ab68b6c57:/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_webshell_configuration.sls?ds=sidebyside diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_webshell_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_webshell_configuration.sls index f2c88c83cf..3a0a23d95f 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_webshell_configuration.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_webshell_configuration.sls @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: AGPL-3.0 +{%- import_yaml "ssl_key_encrypted.sls" as ssl_key_encrypted_pillar %} + ### NGINX nginx: ### SERVER @@ -12,7 +14,7 @@ nginx: ### STREAMS http: upstream webshell_upstream: - - server: 'localhost:4200 fail_timeout=10s' + - server: 'shell.__CLUSTER__.__DOMAIN__:4200 fail_timeout=10s' ### SITES servers: @@ -71,6 +73,9 @@ nginx: - include: snippets/ssl_hardening_default.conf - ssl_certificate: __CERT_PEM__ - ssl_certificate_key: __CERT_KEY__ + {%- 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/webshell.__CLUSTER__.__DOMAIN__.access.log combined - error_log: /var/log/nginx/webshell.__CLUSTER__.__DOMAIN__.error.log