tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
Andrea Dell'Amico 2017-04-12 15:34:41 +02:00
parent 94672dbdb9
commit 9d79eaa89a
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smartgears/smartgears/templates/get-scopes.j2
View File

@ -56,20 +56,14 @@ elif [ $# -eq 1 ] ; then
fi fi
{%if setup_nginx %} {%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 }} HTTP_PORT={{ http_port }}
{% endif %}
{% else %} {% else %}
{%if http_port is defined %} {%if http_port is defined %}
HTTP_PORT={{ http_port }} HTTP_PORT={{ http_port }}
{% endif %}
{% endif %}
{% else %} {% else %}
HTTP_PORT={{ item.http_port }} HTTP_PORT={{ item.http_port }}
{% endif %} {% endif %}
{% endif %}
if [ $USE_SAVED_STATE -ne 0 ] ; then 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" 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"