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

library/roles/smartgears/resource_registry: Fix the repository URL. 

library/roles/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2: Fix a missing {% endif %}.
This commit is contained in:
Andrea Dell'Amico 2016-09-20 12:20:20 +02:00
parent 699ff46674
commit 2f8f9e1d26
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smartgears/resource_registry/defaults/main.yml
View File

@ -6,5 +6,5 @@ resource_registry_version: 1.1.0-20160914.161216-6
resource_registry_name: resource-registry resource_registry_name: resource-registry
smart_executor_name: smart-executor smart_executor_name: smart-executor
resource_registry_file: '{{ resource_registry_name }}-{{ resource_registry_version }}.war' resource_registry_file: '{{ resource_registry_name }}-{{ resource_registry_version }}.war'
resource_registry_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ resource_registry_gcube_repository }}/org/gcube/resources/information-system/{{resource_registry_name}}/{{ resource_registry_snapshot_ver }}/{{ resource_registry_file }}' resource_registry_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ resource_registry_gcube_repository }}/org/gcube/information-system/{{resource_registry_name}}/{{ resource_registry_snapshot_ver }}/{{ resource_registry_file }}'

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

@ -75,13 +75,6 @@ server {
} }
{% endif %} {% endif %}
{% else %} {% else %}
{% for context in instance.app_contexts %}
{% if context == 'whn-manager' %}
location /{{ context }} {
proxy_pass http://localhost:{{ item.http_port }}/{{ context }};
}
{% endif %}
{% endfor %}
location / { location / {
return 301 https://{{ item.servername }}$request_uri; return 301 https://{{ item.servername }}$request_uri;
} }
@ -170,3 +163,4 @@ server {
} }
{% endif %} {% endif %}
} }
{% endif %}