From 9d79eaa89af05c4ce602ca0570ccfa8f24e2ce61 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Wed, 12 Apr 2017 15:34:41 +0200
Subject: [PATCH] library/roles/smartgears/smartgears/templates/get-scopes.j2:
 Fix the get-scopes so that it requests tokens for the port 80 even when we
 redirect to https.

---
 smartgears/smartgears/templates/get-scopes.j2 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/smartgears/smartgears/templates/get-scopes.j2 b/smartgears/smartgears/templates/get-scopes.j2
index 70a74d1e..c8d4271d 100644
--- a/smartgears/smartgears/templates/get-scopes.j2
+++ b/smartgears/smartgears/templates/get-scopes.j2
@@ -56,20 +56,14 @@ elif [ $# -eq 1 ] ; then
 fi
 
 {%if setup_nginx %}
-{%if https_port is defined %}
-{% if http_redirect_to_https is defined and http_redirect_to_https %}
-HTTP_PORT={{ https_port }}
-{% else %}
 HTTP_PORT={{ http_port }}
-{% endif %}
 {% else %}
 {%if http_port is defined %}
 HTTP_PORT={{ http_port }}
-{% endif %}
-{% endif %}
 {% else %}
 HTTP_PORT={{ item.http_port }}
 {% endif %}
+{% endif %}
 
 if [ $USE_SAVED_STATE -ne 0 ] ; then
     logger "$LOG_PREFIX First installation or moving avay to a configuration that needs to be present on all the VREs. Using our scopes list and not the state memorized one"