ISTI-ansible-roles
/
ansible-roles
4
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

d4science-ghn-cluster: New production geonetwork server. 

library/roles/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2: Fix the virtualhost so that it works when some of the optional variables are undefined.
This commit is contained in:
Andrea Dell'Amico 2016-10-26 20:08:28 +02:00
parent 31fa85042c
commit 54a50c9307
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postgresql/defaults/main.yml
View File

@ -172,7 +172,7 @@ psql_wal_files_conf:
# postgis
postgres_install_gis_extensions: False
postgres_gis_version: 2.1
postgres_gis_version: 2.3
postgres_gis_pkgs:
- 'postgresql-{{ psql_version }}-postgis-{{ postgres_gis_version }}'

12
smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
View File

@ -47,7 +47,7 @@ server {
proxy_set_header Connection $connection_upgrade;
{% endif %}
{% if r_connector_install %}
{% if r_connector_install is defined and r_connector_install %}
location /auth-sign-in {
rewrite ^/auth-sign-in http://{{ item.servername }}/r-connector/gcube/service/disconnect;
}
@ -59,12 +59,12 @@ server {
}
{% endfor %}
{% endfor %}
{% if smart_executor_install %}
{% if smart_executor_install is defined and smart_executor_install %}
location {{ smart_executor_context }} {
proxy_pass http://localhost:{{ item.http_port }}{{ smart_executor_context }};
}
{% endif %}
{% if rstudio_install_server %}
{% if rstudio_install_server is defined and rstudio_install_server %}
location / {
proxy_pass http://localhost:8787/;
}
@ -127,7 +127,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
{% endif %}
{% if r_connector_install %}
{% if r_connector_install is defined and r_connector_install %}
location /auth-sign-in {
rewrite ^/auth-sign-in http://{{ item.servername }}/r-connector/gcube/service/disconnect;
}
@ -139,12 +139,12 @@ server {
}
{% endfor %}
{% endfor %}
{% if smart_executor_install %}
{% if smart_executor_install is defined and smart_executor_install %}
location {{ smart_executor_context }} {
proxy_pass http://localhost:{{ item.http_port }}{{ smart_executor_context }};
}
{% endif %}
{% if rstudio_install_server %}
{% if rstudio_install_server is defined and rstudio_install_server %}
location / {
proxy_pass http://localhost:8787/;
}