projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19126: disable all nginx proxy caching for controller in the templates used by the...
[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 aa11cca74e7ff5d4b6558255b2596b9c47dc850d..869cc596a3e3cafdf3698eee8847dad78d9ebd5e 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
@@
-21,7
+21,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,14
+29,16
@@
nginx:
- server_name: __CLUSTER__.__DOMAIN__
- listen:
- 80 default
- server_name: __CLUSTER__.__DOMAIN__
- listen:
- 80 default
+ - 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__
@@
-53,8
+55,13
@@
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_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__
- 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