From 0dc04ad2f9728d04eb4606f0c6d6c93414946271 Mon Sep 17 00:00:00 2001 From: Roberto Date: Thu, 7 Jun 2018 10:07:11 +0200 Subject: [PATCH] ../library/roles/smartgears/storage_hub/defaults/main.yml added net task for storagehub.xml file ../library/roles/smartgears/storage_hub/defaults/main.yml update service version ../library/roles/smartgears/storage_hub/templates/storagehub.xml.j2 fix template --- smartgears/storage_hub/defaults/main.yml | 2 +- smartgears/storage_hub/tasks/main.yml | 6 +++--- smartgears/storage_hub/templates/storagehub.xml.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/smartgears/storage_hub/defaults/main.yml b/smartgears/storage_hub/defaults/main.yml index 0833444e..dba8353c 100644 --- a/smartgears/storage_hub/defaults/main.yml +++ b/smartgears/storage_hub/defaults/main.yml @@ -1,7 +1,7 @@ --- storage_hub_install: False storage_hub_upgrade: False -storage_hub_version: 1.0.0-4.11.1-167790 +storage_hub_version: 1.0.0-4.11.1-167555 storage_hub_name: storagehub storage_hub_group_id: org.gcube.data.access diff --git a/smartgears/storage_hub/tasks/main.yml b/smartgears/storage_hub/tasks/main.yml index a4f6304f..dcfe4095 100644 --- a/smartgears/storage_hub/tasks/main.yml +++ b/smartgears/storage_hub/tasks/main.yml @@ -59,9 +59,9 @@ with_items: '{{ jackrabbit_config_files }}' notify: Restart smartgears -# - name: Install the additional service context default file -# template: src=storagehub.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/storagehub.xml mode=0664 -# notify: Restart smartgears + - name: Install the additional service context default file + template: src=storagehub.xml.j2 dest={{ smartgears_instance_path }}/conf/Catalina/localhost/storagehub.xml mode=0664 + notify: Restart smartgears become: True become_user: '{{ smartgears_user }}' diff --git a/smartgears/storage_hub/templates/storagehub.xml.j2 b/smartgears/storage_hub/templates/storagehub.xml.j2 index 416c9240..feae2f10 100644 --- a/smartgears/storage_hub/templates/storagehub.xml.j2 +++ b/smartgears/storage_hub/templates/storagehub.xml.j2 @@ -4,8 +4,8 @@ auth="Container" type="javax.jcr.Repository" factory="org.apache.jackrabbit.core.jndi.BindableRepositoryFactory" - configFilePath="'{{ storagehub_config_file_path }}'" - repHomeDir="'{{ storagehub_rep_home_dir }}'" + configFilePath="{{ storagehub_config_file_path }}" + repHomeDir="{{ storagehub_rep_home_dir }}" />