projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19126: Merge branch 'main' into 19126-nginx-proxy-settings-change
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
single_host
/
single_hostname
/
pillars
/
nginx_controller_configuration.sls
diff --git
a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_controller_configuration.sls
b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_controller_configuration.sls
index b7b75ab9c289e6e1c4f35d3edbb98b40d56bd382..3058367bc006992342559321696fb7b96664150c 100644
(file)
--- a/
tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_controller_configuration.sls
+++ b/
tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_controller_configuration.sls
@@
-14,28
+14,30
@@
nginx:
default: 1
'127.0.0.0/8': 0
upstream controller_upstream:
default: 1
'127.0.0.0/8': 0
upstream controller_upstream:
- - server: '__
HOSTNAME
_INT__:8003 fail_timeout=10s'
+ - server: '__
IP
_INT__:8003 fail_timeout=10s'
### SITES
servers:
managed:
### DEFAULT
### SITES
servers:
managed:
### DEFAULT
- arvados_controller_default:
+ arvados_controller_default
.conf
:
enabled: true
overwrite: true
config:
- server:
- server_name: _
- listen:
enabled: true
overwrite: true
config:
- server:
- server_name: _
- listen:
- - 80
default_server
+ - 80
- location /.well-known:
- root: /var/www
- location /:
- return: '301 https://$host$request_uri'
- location /.well-known:
- root: /var/www
- location /:
- return: '301 https://$host$request_uri'
- arvados_controller_ssl:
+ arvados_controller_ssl
.conf
:
enabled: true
overwrite: true
enabled: true
overwrite: true
+ requires:
+ __CERT_REQUIRES__
config:
- server:
- server_name: __HOSTNAME_EXT__
config:
- server:
- server_name: __HOSTNAME_EXT__
@@
-52,7
+54,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'
- - include: 'snippets/arvados-snakeoil.conf'
+ - proxy_max_temp_file_size: 0
+ - proxy_request_buffering: 'off'
+ - proxy_buffering: 'off'
+ - proxy_http_version: '1.1'
+ - include: snippets/ssl_hardening_default.conf
+ - ssl_certificate: __CERT_PEM__
+ - ssl_certificate_key: __CERT_KEY__
- access_log: /var/log/nginx/__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/__CLUSTER__.__DOMAIN__.error.log
- client_max_body_size: 128m
- access_log: /var/log/nginx/__CLUSTER__.__DOMAIN__.access.log combined
- error_log: /var/log/nginx/__CLUSTER__.__DOMAIN__.error.log
- client_max_body_size: 128m