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: Fix the get-scopes script so that it takes the right port.

This commit is contained in:
Andrea Dell'Amico 2016-10-05 10:36:10 +02:00
parent 8d541d0dcb
commit 4a9c7ddee3
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
smartgears/smartgears/tasks/smartgears-app.yml
View File

@ -60,6 +60,7 @@
- name: Install the script that fetches the scope tokens - name: Install the script that fetches the scope tokens
template: src=get-scopes.j2 dest=/usr/local/bin/get-scopes owner=root group={{ smartgears_user }} mode=0750 template: src=get-scopes.j2 dest=/usr/local/bin/get-scopes owner=root group={{ smartgears_user }} mode=0750
with_items: '{{ tomcat_m_instances }}'
when: gcube_admin_token is defined when: gcube_admin_token is defined
tags: [ 'smartgears', 'smartgears_conf', 'tomcat' ] tags: [ 'smartgears', 'smartgears_conf', 'tomcat' ]

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

@ -5,11 +5,17 @@ TOKEN=
{%if setup_nginx %} {%if setup_nginx %}
{%if https_port is defined %} {%if https_port is defined %}
{% if http_redirect_to_https is defined and http_redirect_to_https %}
HTTP_PORT={{ https_port }} HTTP_PORT={{ https_port }}
{% else %} {% else %}
HTTP_PORT={{ http_port }} HTTP_PORT={{ http_port }}
{% endif %} {% endif %}
{% else %} {% else %}
{%if http_port is defined %}
HTTP_PORT={{ http_port }}
{% endif %}
{% endif %}
{% else %}
HTTP_PORT={{ item.http_port }} HTTP_PORT={{ item.http_port }}
{% endif %} {% endif %}