projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17750: Update nginx/ssl example pillars and states
[arvados-formula.git]
/
test
/
salt
/
pillar
/
examples
/
nginx_workbench2_configuration.sls
diff --git
a/test/salt/pillar/examples/nginx_workbench2_configuration.sls
b/test/salt/pillar/examples/nginx_workbench2_configuration.sls
index f8946f47bed9961115b8af4b1a924729d8d4636d..3c3ba4e2f0ede750091fb5c5b4a3e648b7eb1094 100644
(file)
--- a/
test/salt/pillar/examples/nginx_workbench2_configuration.sls
+++ b/
test/salt/pillar/examples/nginx_workbench2_configuration.sls
@@
-1,8
+1,18
@@
---
---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{%- 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:
@@
-10,7
+20,7
@@
nginx:
servers:
managed:
### DEFAULT
servers:
managed:
### DEFAULT
- arvados_workbench2_default:
+ arvados_workbench2_default
.conf
:
enabled: true
overwrite: true
config:
enabled: true
overwrite: true
config:
@@
-23,9
+33,11
@@
nginx:
- location /:
- return: '301 https://$host$request_uri'
- location /:
- return: '301 https://$host$request_uri'
- arvados_workbench2_ssl:
+ arvados_workbench2_ssl
.conf
:
enabled: true
overwrite: true
enabled: true
overwrite: true
+ requires:
+ file: nginx_snippet_arvados-snakeoil.conf
config:
- server:
- server_name: workbench2.fixme.example.net
config:
- server:
- server_name: workbench2.fixme.example.net
@@
-39,7
+51,7
@@
nginx:
- return: 503
- location /config.json:
- return: {{ "200 '" ~ '{"API_HOST":"fixme.example.net"}' ~ "'" }}
- return: 503
- location /config.json:
- return: {{ "200 '" ~ '{"API_HOST":"fixme.example.net"}' ~ "'" }}
-
# - include: 'snippets/letsencryp
t.conf'
- - include: 'snippets/snakeoil.conf'
+
- include: 'snippets/ssl_hardening_defaul
t.conf'
+ - include: 'snippets/
arvados-
snakeoil.conf'
- access_log: /var/log/nginx/workbench2.fixme.example.net.access.log combined
- error_log: /var/log/nginx/workbench2.fixme.example.net.error.log
- access_log: /var/log/nginx/workbench2.fixme.example.net.access.log combined
- error_log: /var/log/nginx/workbench2.fixme.example.net.error.log