projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16379: Removes prometheus config for keep1 & keepproxy nodes.
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
multi_host
/
aws
/
pillars
/
nginx_controller_configuration.sls
diff --git
a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_controller_configuration.sls
b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_controller_configuration.sls
index 3be1696602459a68598d3f4e2b44c524dc7f3d06..a48810e833cded5703adfcabe67104c5526e494f 100644
(file)
--- a/
tools/salt-install/config_examples/multi_host/aws/pillars/nginx_controller_configuration.sls
+++ b/
tools/salt-install/config_examples/multi_host/aws/pillars/nginx_controller_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 ssl_key_encrypted_pillar %}
+
### NGINX
nginx:
### SERVER
### NGINX
nginx:
### SERVER
@@
-21,7
+23,7
@@
nginx:
servers:
managed:
### DEFAULT
servers:
managed:
### DEFAULT
- arvados_controller_default:
+ arvados_controller_default
.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-29,15
+31,16
@@
nginx:
- server_name: __CLUSTER__.__DOMAIN__
- listen:
- 80 default
- server_name: __CLUSTER__.__DOMAIN__
- listen:
- 80 default
- - include: snippets/letsencrypt_well_known.conf
+ - location /.well-known:
+ - root: /var/www
- location /:
- return: '301 https://$host$request_uri'
- location /:
- return: '301 https://$host$request_uri'
- arvados_controller_ssl:
+ arvados_controller_ssl
.conf
:
enabled: true
overwrite: true
requires:
enabled: true
overwrite: true
requires:
-
cmd: create-initial-cert-__CLUSTER__.__DOMAIN__-__CLUSTER__.__DOMAIN
__
+
__CERT_REQUIRES
__
config:
- server:
- server_name: __CLUSTER__.__DOMAIN__
config:
- server:
- server_name: __CLUSTER__.__DOMAIN__
@@
-54,8
+57,18
@@
nginx:
- proxy_set_header: 'X-Real-IP $remote_addr'
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
- proxy_set_header: 'X-External-Client $external_client'
- proxy_set_header: 'X-Real-IP $remote_addr'
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
- proxy_set_header: 'X-External-Client $external_client'
+ - proxy_set_header: 'Upgrade $http_upgrade'
+ - proxy_set_header: 'Connection "upgrade"'
+ - proxy_max_temp_file_size: 0
+ - proxy_request_buffering: 'off'
+ - proxy_buffering: 'off'
+ - proxy_http_version: '1.1'
- include: snippets/ssl_hardening_default.conf
- include: snippets/ssl_hardening_default.conf
- - include: snippets/__CLUSTER__.__DOMAIN___letsencrypt_cert[.]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/controller.__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/controller.__CLUSTER__.__DOMAIN__.error.log
- client_max_body_size: 128m
- access_log: /var/log/nginx/controller.__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/controller.__CLUSTER__.__DOMAIN__.error.log
- client_max_body_size: 128m