From 72af5c08fe27c4412041f9998d194c8114372ed9 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 23 Jun 2016 12:37:49 +0200 Subject: [PATCH 1/2] library/roles/smartgears/dataminer_app/defaults/main.yml: Fix the dataminer configuration jar's URL. --- smartgears/dataminer_app/defaults/main.yml | 2 +- smartgears/dataminer_app/tasks/dataminer-app.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml index 099fe433..31852881 100644 --- a/smartgears/dataminer_app/defaults/main.yml +++ b/smartgears/dataminer_app/defaults/main.yml @@ -46,7 +46,7 @@ dataminer_ecocfg_parallelproc_svn_repo: 'http://svn.research-infrastructures.eu/ dataminer_wps_config: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/wpscfg/wps_config.xml' dataminer_configuration_jar: 'dataminer-algorithms.jar' -dataminer_configuration_jar_url: 'http://svn.d4science.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/{{ dataminer_configuration_jar }}' +dataminer_configuration_jar_url: 'http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/DataMinerConfiguration/algorithms/{{ dataminer_configuration_jar }}' dataminer_data_file_from_thredds: 'http://thredds.d4science.org/thredds/fileServer/public/netcdf/gebco_08_OCEANS_CLIMATOLOGY_METEOROLOGY_ATMOSPHERE_.nc' diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index b83d7d5d..fa0a1862 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -114,7 +114,7 @@ - name: Download the dataminer config jar become: True become_user: '{{ smartgears_user }}' - subversion: repo={{ dataminer_configuration_jar_url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/lib/{{ dataminer_configuration_jar }} force=yes + get_url: url={{ dataminer_configuration_jar_url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/lib/{{ dataminer_configuration_jar }} force=yes notify: Restart smartgears when: dataminer_app_install tags: [ 'tomcat', 'dataminer', 'wps' ] From 276e45ec151444ff0f13885f13ed2f867030d9df Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 23 Jun 2016 12:58:50 +0200 Subject: [PATCH 2/2] library/roles/smartgears/dataminer_app/tasks/dataminer-app.yml: Fix the dataminer config jar destination path. --- smartgears/dataminer_app/tasks/dataminer-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml index fa0a1862..35ebdc0c 100644 --- a/smartgears/dataminer_app/tasks/dataminer-app.yml +++ b/smartgears/dataminer_app/tasks/dataminer-app.yml @@ -114,7 +114,7 @@ - name: Download the dataminer config jar become: True become_user: '{{ smartgears_user }}' - get_url: url={{ dataminer_configuration_jar_url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/lib/{{ dataminer_configuration_jar }} force=yes + get_url: url={{ dataminer_configuration_jar_url }} dest={{ smartgears_instance_path }}/webapps/{{ dataminer_52north_webapp_name }}/WEB-INF/lib/{{ dataminer_configuration_jar }} force=yes notify: Restart smartgears when: dataminer_app_install tags: [ 'tomcat', 'dataminer', 'wps' ]