projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat(distro): add centos-7 support
[arvados-formula.git]
/
test
/
salt
/
pillar
/
examples
/
nginx_workbench_configuration.sls
diff --git
a/test/salt/pillar/examples/nginx_workbench_configuration.sls
b/test/salt/pillar/examples/nginx_workbench_configuration.sls
index 5a394f535dda71b27e343d14e799ee843794b5e9..5b8e0e2fee9b3a271ff8c9a62448551bb14a1e7e 100644
(file)
--- a/
test/salt/pillar/examples/nginx_workbench_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_workbench_configuration.sls
@@
-1,8
+1,14
@@
---
---
+{%- if grains.os_family in ('RedHat',) %}
+ {%- set group = 'nginx' %}
+{%- else %}
+ {%- set group = 'www-data' %}
+{%- endif %}
+
### ARVADOS
arvados:
config:
### ARVADOS
arvados:
config:
- group:
www-data
+ group:
{{ group }}
### NGINX
nginx:
### NGINX
nginx:
@@
-19,7
+25,7
@@
nginx:
servers:
managed:
### DEFAULT
servers:
managed:
### DEFAULT
- arvados_workbench_default:
+ arvados_workbench_default
.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-32,7
+38,7
@@
nginx:
- location /:
- return: '301 https://$host$request_uri'
- location /:
- return: '301 https://$host$request_uri'
- arvados_workbench_ssl:
+ arvados_workbench_ssl
.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-50,12
+56,13
@@
nginx:
- proxy_set_header: 'Host $http_host'
- proxy_set_header: 'X-Real-IP $remote_addr'
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
- proxy_set_header: 'Host $http_host'
- proxy_set_header: 'X-Real-IP $remote_addr'
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
+ - 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/workbench.fixme.example.net.access.log combined
- error_log: /var/log/nginx/workbench.fixme.example.net.error.log
- access_log: /var/log/nginx/workbench.fixme.example.net.access.log combined
- error_log: /var/log/nginx/workbench.fixme.example.net.error.log
- arvados_workbench_upstream:
+ arvados_workbench_upstream
.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config: