projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat(components,version): add extra components, new version
[arvados-formula.git]
/
test
/
salt
/
pillar
/
examples
/
nginx_keepweb_configuration.sls
diff --git
a/test/salt/pillar/examples/nginx_keepweb_configuration.sls
b/test/salt/pillar/examples/nginx_keepweb_configuration.sls
index 42a72406546f42bc3165ef1b3aa241eba072af21..cbc4aef192420dcc6cde6fbefd556843d6b751d2 100644
(file)
--- a/
test/salt/pillar/examples/nginx_keepweb_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_keepweb_configuration.sls
@@
-1,6
+1,4
@@
---
---
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
### SERVER
### NGINX
nginx:
### SERVER
@@
-9,7
+7,7
@@
nginx:
### STREAMS
http:
upstream collections_downloads_upstream:
### STREAMS
http:
upstream collections_downloads_upstream:
- - server: '127.0.0.
1
:9002 fail_timeout=10s'
+ - server: '127.0.0.
2
:9002 fail_timeout=10s'
servers:
managed:
servers:
managed:
@@
-19,7
+17,7
@@
nginx:
overwrite: true
config:
- server:
overwrite: true
config:
- server:
- - server_name: collections.
example.net download
.example.net
+ - server_name: collections.
fixme.example.net download.fixme
.example.net
- listen:
- 80
- location /.well-known:
- listen:
- 80
- location /.well-known:
@@
-33,7
+31,7
@@
nginx:
overwrite: true
config:
- server:
overwrite: true
config:
- server:
- - server_name: collections.
example.net download
.example.net
+ - server_name: collections.
fixme.example.net download.fixme
.example.net
- listen:
- 443 http2 ssl
- index: index.html index.htm
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@
-52,5
+50,5
@@
nginx:
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log:
{{ nginx_log }}/collections
.example.net.access.log combined
- - error_log:
{{ nginx_log }}/collections
.example.net.error.log
+ - access_log:
/var/log/nginx/collections.fixme
.example.net.access.log combined
+ - error_log:
/var/log/nginx/collections.fixme
.example.net.error.log