projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs(single_host): fix hostnames and tests
[arvados-formula.git]
/
test
/
salt
/
pillar
/
examples
/
nginx_keepproxy_configuration.sls
diff --git
a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
b/test/salt/pillar/examples/nginx_keepproxy_configuration.sls
index 2485b37eb99dfee4556e6aa367f76c0547576db7..f1729e7172b248c726be4211df96599f2db3d01d 100644
(file)
--- a/
test/salt/pillar/examples/nginx_keepproxy_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_keepproxy_configuration.sls
@@
-7,12
+7,12
@@
nginx:
### STREAMS
http:
upstream keepproxy_upstream:
### STREAMS
http:
upstream keepproxy_upstream:
- - server: '
127.0.0.2
:25100 fail_timeout=10s'
+ - server: '
keep.internal
:25100 fail_timeout=10s'
servers:
managed:
### DEFAULT
servers:
managed:
### DEFAULT
- arvados_keep
_default
:
+ arvados_keep
proxy_default.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-25,7
+25,7
@@
nginx:
- location /:
- return: '301 https://$host$request_uri'
- location /:
- return: '301 https://$host$request_uri'
- arvados_keepproxy:
+ arvados_keepproxy
_ssl.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-48,7
+48,8
@@
nginx:
- client_max_body_size: 64M
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
- client_max_body_size: 64M
- proxy_http_version: '1.1'
- proxy_request_buffering: 'off'
+ - include: 'snippets/ssl_hardening_default.conf'
# - include: 'snippets/letsencrypt.conf'
# - include: 'snippets/letsencrypt.conf'
- - include: 'snippets/snakeoil.conf'
+ - include: 'snippets/s
sl_s
nakeoil.conf'
- access_log: /var/log/nginx/keepproxy.fixme.example.net.access.log combined
- error_log: /var/log/nginx/keepproxy.fixme.example.net.error.log
- access_log: /var/log/nginx/keepproxy.fixme.example.net.access.log combined
- error_log: /var/log/nginx/keepproxy.fixme.example.net.error.log