From 0ed9f4228a9e3e508130e4a3b16960e59c7f54f3 Mon Sep 17 00:00:00 2001 From: Roberto Date: Tue, 19 Sep 2017 19:58:22 +0200 Subject: [PATCH] ../library/roles/smartgears/dm_pool_manager/templates/web.xml.j2 ./library/roles/smartgears/dm_pool_manager/templates/service.properties.j2 add new templates ./library/roles/smartgears/social-networking-library-ws/defaults/main.yml set version for 4.6.1 release --- smartgears/dm_pool_manager/defaults/main.yml | 2 +- smartgears/dm_pool_manager/tasks/main.yml | 4 ++ .../templates/service.properties.j2 | 65 +++++++++++++++---- .../dm_pool_manager/templates/web.xml.j2 | 3 +- .../defaults/main.yml | 2 +- 5 files changed, 59 insertions(+), 17 deletions(-) diff --git a/smartgears/dm_pool_manager/defaults/main.yml b/smartgears/dm_pool_manager/defaults/main.yml index f97e9dae..6eb9f23f 100644 --- a/smartgears/dm_pool_manager/defaults/main.yml +++ b/smartgears/dm_pool_manager/defaults/main.yml @@ -13,7 +13,7 @@ dm_pool_dev_ghost_instance: 'DEV_STAGING_HOST: dataminer1-devnext.d4science.org' dm_pool_manager_pkgs: - subversion -dm_pool_svn_url: https://svn.d4science.research-infrastructures.eu:443/gcube/trunk/data-analysis +dm_pool_svn_url: http://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis svn_user: svn.d4science svn_pass: "{{ vault_svn_pass }}" prod_instance: False diff --git a/smartgears/dm_pool_manager/tasks/main.yml b/smartgears/dm_pool_manager/tasks/main.yml index ca58e353..0203bb7e 100644 --- a/smartgears/dm_pool_manager/tasks/main.yml +++ b/smartgears/dm_pool_manager/tasks/main.yml @@ -28,6 +28,10 @@ file: path={{ item.user_home }}/dataminer-pool-manager/dpmConfig state=directory recurse=true with_items: '{{ tomcat_m_instances }}' + # Create a 2048-bit SSH key for user jsmith in ~jsmith/.ssh/id_rsa + - name: create user key + user: name='{{ smartgears_user }}' generate_ssh_key=yes ssh_key_bits=2048 ssh_key_file=.ssh/id_rsa + - name: Install the additional service default file template: src=service.properties.j2 dest={{ item.user_home }}/dataminer-pool-manager/dpmConfig/service.properties mode=0444 with_items: '{{ tomcat_m_instances }}' diff --git a/smartgears/dm_pool_manager/templates/service.properties.j2 b/smartgears/dm_pool_manager/templates/service.properties.j2 index 9d2260ed..a3e1fd11 100644 --- a/smartgears/dm_pool_manager/templates/service.properties.j2 +++ b/smartgears/dm_pool_manager/templates/service.properties.j2 @@ -10,45 +10,84 @@ SVN_REPO: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-ana svn.repository = https://svn.d4science.research-infrastructures.eu/gcube + + svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms + + svn.rproto.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/proto/algorithms -svn.rproto.deps-linux-compiled = -svn.rproto.deps-pre-installed = -svn.rproto.deps-r-blackbox = -svn.rproto.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/test_r_cran_pkgs.txt + + +svn.rproto.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt + +svn.rproto.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt + +svn.rproto.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt + +svn.rproto.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt + svn.rproto.deps-java = + svn.rproto.deps-knime-workflow = + svn.rproto.deps-octave = + svn.rproto.deps-python = + svn.rproto.deps-windows-compiled = + + + svn.prod.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/prod/algorithms -svn.prod.deps-linux-compiled = -svn.prod.deps-pre-installed = -svn.prod.deps-r-blackbox = + + +svn.prod.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt + +svn.prod.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt + +svn.prod.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt + svn.prod.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt + svn.prod.deps-java = + svn.prod.deps-knime-workflow = + svn.prod.deps-octave = + svn.prod.deps-python = + svn.prod.deps-windows-compiled = -svn.dev.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms -svn.dev.deps-linux-compiled = -svn.dev.deps-pre-installed = -svn.dev.deps-r-blackbox = + + + +svn.dev.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/preprod/algorithms + + + +svn.dev.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt + +svn.dev.deps-pre-installed = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt + +svn.dev.deps-r-blackbox = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt + svn.dev.deps-r = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_cran_pkgs.txt + svn.dev.deps-java = + svn.dev.deps-knime-workflow = + svn.dev.deps-octave = + svn.dev.deps-python = -svn.dev.deps-windows-compiled = - +svn.dev.deps-windows-compiled = diff --git a/smartgears/dm_pool_manager/templates/web.xml.j2 b/smartgears/dm_pool_manager/templates/web.xml.j2 index 8e653329..e0ac8652 100644 --- a/smartgears/dm_pool_manager/templates/web.xml.j2 +++ b/smartgears/dm_pool_manager/templates/web.xml.j2 @@ -9,8 +9,7 @@ Environment {% if proto_instance %} Proto -{% endif %} -{% if prod_instance %} +{% elif prod_instance %} Prod {% else %} Dev diff --git a/smartgears/social-networking-library-ws/defaults/main.yml b/smartgears/social-networking-library-ws/defaults/main.yml index 4a5c0c81..d6a0c066 100644 --- a/smartgears/social-networking-library-ws/defaults/main.yml +++ b/smartgears/social-networking-library-ws/defaults/main.yml @@ -1,6 +1,6 @@ --- social_networking_library_ws_install: False -social_networking_library_ws_version: latest +social_networking_library_ws_version: 2.1.0-4.6.1-152935 social_networking_library_ws_name: social-networking-library-ws social_networking_library_ws_group_id: org.gcube.portal social_networking_library_ws_extension: war