X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6f84dbb74b46470e937a52cbbb5de4c5b825e122..2eeaf4eacf23e166b60cf95562ea2727a68e1e08:/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls?ds=sidebyside diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls index ec28b98c60..32904a12b2 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls @@ -23,7 +23,7 @@ nginx: servers: managed: ### DEFAULT - arvados_workbench_default: + arvados_workbench_default.conf: enabled: true overwrite: true config: @@ -34,11 +34,11 @@ nginx: - location /: - return: '301 https://$host$request_uri' - arvados_workbench_ssl: + arvados_workbench_ssl.conf: enabled: true overwrite: true requires: - cmd: create-initial-cert-workbench.__CLUSTER__.__DOMAIN__-workbench.__CLUSTER__.__DOMAIN__ + __CERT_REQUIRES__ config: - server: - server_name: workbench.__CLUSTER__.__DOMAIN__ @@ -55,7 +55,8 @@ nginx: - proxy_set_header: 'X-Real-IP $remote_addr' - proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for' - include: snippets/ssl_hardening_default.conf - - include: snippets/workbench.__CLUSTER__.__DOMAIN___letsencrypt_cert[.]conf + - ssl_certificate: __CERT_PEM__ + - ssl_certificate_key: __CERT_KEY__ - access_log: /var/log/nginx/workbench.__CLUSTER__.__DOMAIN__.access.log combined - error_log: /var/log/nginx/workbench.__CLUSTER__.__DOMAIN__.error.log