Merge branch 'master' of gitorious.research-infrastructures.eu:infrastructure-management/ansible-playbooks

smartgears/dataminer_app/tasks/install-gcube-key.yml

@@ -11,6 +11,7 @@
         - '{{ gcube_prod_key_6 }}'
         - '{{ gcube_prod_key_7 }}'
         - '{{ gcube_prod_key_8 }}'
+        - '{{ gcube_prod_key_9 }}'
       notify: Restart smartgears
       when: install_gcube_prod_key
 
@@ -22,6 +23,10 @@
         - '{{ gcube_prod_key_3 }}'
         - '{{ gcube_prod_key_4 }}'
         - '{{ gcube_prod_key_5 }}'
+        - '{{ gcube_prod_key_6 }}'
+        - '{{ gcube_prod_key_7 }}'
+        - '{{ gcube_prod_key_8 }}'
+        - '{{ gcube_prod_key_9 }}'
       notify: Restart smartgears 
       when: not install_gcube_prod_key
 

smartgears/oscar_importer_se_plugin/defaults/main.yml

@@ -0,0 +1,12 @@
+---
+oscar_importer_se_plugin_install: False
+oscar_importer_se_plugin_upgrade: False
+oscar_importer_se_plugin_version: latest
+
+oscar_importer_se_plugin_group_id: 'org.gcube.dataanalysis'
+oscar_importer_se_plugin_name: 'oscar-importer-se-plugin'
+oscar_importer_se_plugin_extension: 'jar'
+oscar_importer_se_plugin_classifier: 'jar-with-dependencies'
+oscar_importer_se_plugin_file: '{{ oscar_importer_se_plugin_name }}-{{ oscar_importer_se_plugin_version }}-jar-with-dependencies.{{ oscar_importer_se_plugin_extension }}'
+
+# Note: the deb package libnetcdfc7 is required

smartgears/oscar_importer_se_plugin/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+- block:
+    - name: Remove the old oscar-importer plugin
+      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/oscar-importer-se-plugin-*-jar-with-dependencies.jar
+      when: oscar_importer_se_plugin_upgrade
+    
+    - name: Install the oscar-importer plugin inside the smart executor lib directory
+      maven_artifact: artifact_id={{ oscar_importer_se_plugin_name }} version={{ oscar_importer_se_plugin_version | default(omit) }} group_id={{ oscar_importer_se_plugin_group_id }} extension={{ oscar_importer_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ oscar_importer_se_plugin_classifier }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_file }}
+      notify: Restart smartgears
+ 
+    - name: Install the libnetcdfc7 package
+      apt: pkg=libnetcdfc7 state=present update_cache=yes cache_valid_time=1800
+
+  become: True
+  become_user: '{{ smartgears_user }}'
+  when: oscar_importer_se_plugin_install
+  tags: [ 'smartgears', 'oscar_importer_se', 'tomcat' ]

smartgears/smartgears-nginx-frontend/defaults/main.yml

@@ -7,3 +7,4 @@ smartgears_install_generic_virthost: True
 smartgears_nginx_cors_enabled: False
 nginx_cors_acl_origin: ''
 data_transfer_service_install: False 
+smartgears_nginx_expose_tomcat_logs: False

smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2

@@ -93,6 +93,15 @@ server {
         proxy_pass http://localhost:8787/;
     }
     {% endif %}
+
+    {% if smartgears_nginx_expose_tomcat_logs %}
+    location /gcube-logs/ {
+        alias {{ smartgears_instance_path }}/logs/;
+        autoindex on;
+        autoindex_localtime on;
+        }
+    {% endif %}
+
     {% else %}
     location / {
         {% if smartgears_nginx_cors_enabled %}
@@ -198,5 +207,12 @@ server {
     }
     {% endif %}
 
+    {% if smartgears_nginx_expose_tomcat_logs %}
+    location /gcube-logs/ {
+        alias {{ smartgears_instance_path }}/logs/;
+        autoindex on;
+        autoindex_localtime on;
+        }
+    {% endif %}
 }
 {% endif %}

smartgears/smartgears/tasks/install-gcube-keys.yml

@@ -11,6 +11,7 @@
         - '{{ gcube_prod_key_6 }}'
         - '{{ gcube_prod_key_7 }}'
         - '{{ gcube_prod_key_8 }}'
+        - '{{ gcube_prod_key_9 }}'
       notify: Restart smartgears 
       when: install_gcube_prod_key
 
@@ -22,6 +23,10 @@
         - '{{ gcube_prod_key_3 }}'
         - '{{ gcube_prod_key_4 }}'
         - '{{ gcube_prod_key_5 }}'
+        - '{{ gcube_prod_key_6 }}'
+        - '{{ gcube_prod_key_7 }}'
+        - '{{ gcube_prod_key_8 }}'
+        - '{{ gcube_prod_key_9 }}'
       notify: Restart smartgears 
       when: not install_gcube_prod_key