projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20035: Updates nginx pillars to read the certificate privkey password.
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
multi_host
/
aws
/
pillars
/
nginx_keepproxy_configuration.sls
diff --git
a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_keepproxy_configuration.sls
b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_keepproxy_configuration.sls
index 5d8b37e595a5a0d17d981c62b1bf1a5f68728f82..690d9413b44dcd573690dc8fa7dad9883998343a 100644
(file)
--- a/
tools/salt-install/config_examples/multi_host/aws/pillars/nginx_keepproxy_configuration.sls
+++ b/
tools/salt-install/config_examples/multi_host/aws/pillars/nginx_keepproxy_configuration.sls
@@
-3,6
+3,8
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
+{%- import_yaml "ssl_key_encrypted.sls" as imported %}
+
### NGINX
nginx:
### SERVER
### NGINX
nginx:
### SERVER
@@
-16,7
+18,7
@@
nginx:
servers:
managed:
### DEFAULT
servers:
managed:
### DEFAULT
- arvados_keepproxy_default:
+ arvados_keepproxy_default
.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-24,20
+26,19
@@
nginx:
- server_name: keep.__CLUSTER__.__DOMAIN__
- listen:
- 80
- server_name: keep.__CLUSTER__.__DOMAIN__
- listen:
- 80
- - include: snippets/letsencrypt_well_known.conf
- location /:
- return: '301 https://$host$request_uri'
- location /:
- return: '301 https://$host$request_uri'
- arvados_keepproxy_ssl:
+ arvados_keepproxy_ssl
.conf
:
enabled: true
overwrite: true
requires:
enabled: true
overwrite: true
requires:
-
cmd: create-initial-cert-keep.__CLUSTER__.__DOMAIN__-keep.__CLUSTER__.__DOMAIN
__
+
__CERT_REQUIRES
__
config:
- server:
- server_name: keep.__CLUSTER__.__DOMAIN__
- listen:
config:
- server:
- server_name: keep.__CLUSTER__.__DOMAIN__
- listen:
- - __
CONTROLLER
_EXT_SSL_PORT__ http2 ssl
+ - __
KEEP
_EXT_SSL_PORT__ http2 ssl
- index: index.html index.htm
- location /:
- proxy_pass: 'http://keepproxy_upstream'
- index: index.html index.htm
- location /:
- proxy_pass: 'http://keepproxy_upstream'
@@
-54,6
+55,10
@@
nginx:
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- include: snippets/ssl_hardening_default.conf
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- include: snippets/ssl_hardening_default.conf
- - include: snippets/keep.__CLUSTER__.__DOMAIN___letsencrypt_cert[.]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 }}
+ {%- endif %}
- access_log: /var/log/nginx/keepproxy.__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/keepproxy.__CLUSTER__.__DOMAIN__.error.log
- access_log: /var/log/nginx/keepproxy.__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/keepproxy.__CLUSTER__.__DOMAIN__.error.log