From 54a50c9307a304b8c5274e42b4f93d08dc75ab6f Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Wed, 26 Oct 2016 20:08:28 +0200
Subject: [PATCH] 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.

---
 postgresql/defaults/main.yml                         |  2 +-
 .../templates/generic-smartgears-virtualhost.j2      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/postgresql/defaults/main.yml b/postgresql/defaults/main.yml
index a890f06f..13e124fb 100644
--- a/postgresql/defaults/main.yml
+++ b/postgresql/defaults/main.yml
@@ -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 }}'
 
diff --git a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
index 6ecb0028..d7d1d5dc 100644
--- a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
+++ b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
@@ -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/;
     }