projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19015: installer fix: work around a Passenger issue with the detection of RVM
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
single_host
/
single_hostname
/
pillars
/
nginx_api_configuration.sls
diff --git
a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls
b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls
index 18f09af50329e4af62674e5f79393e8348e8a7c3..04195ae5b9b23e25f21ad1703b66c4a2116cfb21 100644
(file)
--- a/
tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls
+++ b/
tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_api_configuration.sls
@@
-3,22
+3,28
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.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:
### SITES
servers:
managed:
### NGINX
nginx:
### SITES
servers:
managed:
- arvados_api:
+ arvados_api
.conf
:
enabled: true
overwrite: true
config:
- server:
enabled: true
overwrite: true
config:
- server:
- - listen: '__
HOSTNAME
_INT__:8004'
+ - listen: '__
IP
_INT__:8004'
- server_name: api
- root: /var/www/arvados-api/current/public
- index: index.html index.htm
- server_name: api
- root: /var/www/arvados-api/current/public
- index: index.html index.htm