From 2f8f9e1d2619d4f815831c43a5767ec22d2e5782 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 20 Sep 2016 12:20:20 +0200 Subject: [PATCH] library/roles/smartgears/resource_registry: Fix the repository URL. library/roles/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2: Fix a missing {% endif %}. --- smartgears/resource_registry/defaults/main.yml | 2 +- .../templates/generic-smartgears-virtualhost.j2 | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/smartgears/resource_registry/defaults/main.yml b/smartgears/resource_registry/defaults/main.yml index 0308899..2ae9902 100644 --- a/smartgears/resource_registry/defaults/main.yml +++ b/smartgears/resource_registry/defaults/main.yml @@ -6,5 +6,5 @@ resource_registry_version: 1.1.0-20160914.161216-6 resource_registry_name: resource-registry smart_executor_name: smart-executor 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 }}' diff --git a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 index 7144072..231b8ca 100644 --- a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 +++ b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 @@ -75,13 +75,6 @@ server { } {% endif %} {% else %} - {% for context in instance.app_contexts %} - {% if context == 'whn-manager' %} - location /{{ context }} { - proxy_pass http://localhost:{{ item.http_port }}/{{ context }}; - } - {% endif %} - {% endfor %} location / { return 301 https://{{ item.servername }}$request_uri; } @@ -170,3 +163,4 @@ server { } {% endif %} } +{% endif %}