From 861672bab14b781f11180b98aba2b342911ae9c1 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 9 May 2017 16:22:22 +0200 Subject: [PATCH] d4science-ghn-cluster/group_vars/geonetwork_prod_smartgears: Install the geonetwork app, for real. library/roles/smartgears/gcubeapp-setup: Fix the installation path. --- smartgears/gcubeapp-setup/tasks/main.yml | 2 +- smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smartgears/gcubeapp-setup/tasks/main.yml b/smartgears/gcubeapp-setup/tasks/main.yml index d1c3a34..cef2361 100644 --- a/smartgears/gcubeapp-setup/tasks/main.yml +++ b/smartgears/gcubeapp-setup/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install the gcube-app file to make the webapp smartgears compatible - template: src=gcube-app.xml.j2 dest={{ item.0.instance_path }}/webapps/{{ item.1.webapp_name }}/WEB-INF/gcube-app.xml owner={{ item.0.user }} group={{ item.0.user }} + template: src=gcube-app.xml.j2 dest={{ item.0.instance_path }}/webapps/{{ item.1.webapp_name | lower }}/WEB-INF/gcube-app.xml owner={{ item.0.user }} group={{ item.0.user }} with_together: - '{{ tomcat_m_instances }}' - '{{ gcubeapp_webapps | default (omit) }}' diff --git a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 index d0a406f..3f58c99 100644 --- a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 +++ b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 @@ -10,7 +10,7 @@ {% endif %} {% if item.1.exclude_handlers is defined %} -{% for eh in exclude_handlers %} +{% for eh in item.1.exclude_handlers %} {% endfor %} {% endif %}