From b0d0c60c0400c6ec41597f86cb3e7b90d09c96e6 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Thu, 1 Dec 2016 17:06:25 +0100
Subject: [PATCH] group_vars/rstudio_dev/rstudio.yml added smartgears_scope
 variable definition ../library/roles/rstudio-server/tasks/main.yml added
 igoring error on download certificate task
 ../library/roles/smartgears/smartgears/templates/container.xml.j2 update
 "frequencypublication" from 60 to 180 sec

---
 rstudio-server/tasks/main.yml                    | 1 +
 smartgears/r_connector/defaults/main.yml         | 2 +-
 smartgears/smartgears/templates/container.xml.j2 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rstudio-server/tasks/main.yml b/rstudio-server/tasks/main.yml
index 6511535..0741a4f 100644
--- a/rstudio-server/tasks/main.yml
+++ b/rstudio-server/tasks/main.yml
@@ -6,6 +6,7 @@
     - name: Download the rstudio server deb package
       get_url: url={{ rstudio_download_url }} dest=/srv/{{ rstudio_file }}
       register: rstudio_download
+      ignore_errors: True
 
     - name: Install the rstudio server package
       command: gdebi -n -q /srv/{{ rstudio_file }}
diff --git a/smartgears/r_connector/defaults/main.yml b/smartgears/r_connector/defaults/main.yml
index 452b8cf..8b19736 100644
--- a/smartgears/r_connector/defaults/main.yml
+++ b/smartgears/r_connector/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 gcube_repository: 'gcube-staging'
 r_connector_install: False
-r_connector_ver: 2.1.1-4.2.0-134825
+r_connector_ver: 2.1.1-4.2.0-135146
 r_connector_name: r-connector
 r_connector_filename: '{{ r_connector_name }}-{{ r_connector_ver }}.war'
 r_connector_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/data/analysis/{{ r_connector_name }}/{{ r_connector_ver}}/{{ r_connector_filename }}'
diff --git a/smartgears/smartgears/templates/container.xml.j2 b/smartgears/smartgears/templates/container.xml.j2
index 89f13a9..e9db2c4 100644
--- a/smartgears/smartgears/templates/container.xml.j2
+++ b/smartgears/smartgears/templates/container.xml.j2
@@ -26,7 +26,7 @@
 
   <property name='SmartGearsDistributionBundle' value='UnBundled' />
   <property name='SmartGearsDistribution' value='{{ smartgears_distribution_version }}' />
-  <publication-frequency>60</publication-frequency>
+  <publication-frequency>180</publication-frequency>
   <infrastructure>{{ smartgears_infrastructure_name }}</infrastructure>
 
   {% if smartgears_distribution_version | version_compare('2.0.0', '<') %}