From 8c2262a3f05c4040f3232fc3b7cd5917283eb47c Mon Sep 17 00:00:00 2001 From: "tommaso.piccioli" Date: Wed, 22 Mar 2017 16:09:05 +0100 Subject: [PATCH] icproxy deploy in registry.d4science.org with the exclude tag when ic_proxy_allscopes is True --- smartgears/ic_proxy/defaults/main.yml | 1 + smartgears/ic_proxy/tasks/main.yml | 5 +++++ smartgears/ic_proxy/templates/gcube-app.xml.j2 | 13 +++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 smartgears/ic_proxy/templates/gcube-app.xml.j2 diff --git a/smartgears/ic_proxy/defaults/main.yml b/smartgears/ic_proxy/defaults/main.yml index aceeafa1..fbacd8cb 100644 --- a/smartgears/ic_proxy/defaults/main.yml +++ b/smartgears/ic_proxy/defaults/main.yml @@ -1,5 +1,6 @@ --- ic_proxy_install: False +ic_proxy_allscopes: False ic_proxy_version: latest ic_proxy_name: icproxy ic_proxy_group_id: org.gcube.information-system diff --git a/smartgears/ic_proxy/tasks/main.yml b/smartgears/ic_proxy/tasks/main.yml index b7cdae43..575294db 100644 --- a/smartgears/ic_proxy/tasks/main.yml +++ b/smartgears/ic_proxy/tasks/main.yml @@ -20,6 +20,11 @@ unarchive: copy=no src={{ smartgears_user_home }}/{{ ic_proxy_file }} dest={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }} creates={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}/WEB-INF/lib notify: Restart smartgears + - name: Fix exclude tag in gcube-app.xml + template: src=gcube-app.xml.j2 dest={{ smartgears_instance_path }}/webapps/{{ ic_proxy_name }}/WEB-INF/gcube-app.xml owner={{ d4science_user }} group={{ d4science_user }} + notify: Restart smartgears + when: ic_proxy_allscopes + become: True become_user: '{{ d4science_user }}' when: ic_proxy_install diff --git a/smartgears/ic_proxy/templates/gcube-app.xml.j2 b/smartgears/ic_proxy/templates/gcube-app.xml.j2 new file mode 100644 index 00000000..7c09652b --- /dev/null +++ b/smartgears/ic_proxy/templates/gcube-app.xml.j2 @@ -0,0 +1,13 @@ + + ICProxy + InformationSystem + 1.1.1-4.4.0-142273 + icproxy webapp + + + /ServiceEndpoint/* + /* + +