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

letsencrypt-acmetool-client/defaults/main.yml

@@ -22,7 +22,8 @@ letsencrypt_acme_certs_dir: '{{ letsencrypt_acme_user_home }}/live/{{ ansible_fq
 letsencrypt_acme_services_scripts_dir: /usr/lib/acme/hooks
 
 # responses parameters
-letsencrypt_tos_url: 'https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf'
+#letsencrypt_tos_url: 'https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf'
+letsencrypt_tos_url: 'https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf'
 letsencrypt_acme_agree_tos: true  
 letsencrypt_acme_rsa_key_size: 4096
 letsencrypt_ocsp_must_staple: True

letsencrypt-acmetool-client/tasks/main.yml

@@ -28,7 +28,7 @@
 - name: Create the letsencrypt acme user
   user: name={{ letsencrypt_acme_user }} home={{ letsencrypt_acme_user_home }} createhome=no shell=/usr/sbin/nologin system=yes
   when: letsencrypt_acme_install
-  tags: letsencrypt
+  tags: [ 'letsencrypt', 'letsencrypt_user' ]
 
 - name: Create the letsencrypt acme home, if it does not exist already. In a separate step because it could be already there.
   file: dest={{ letsencrypt_acme_user_home }} owner={{ letsencrypt_acme_user }} group={{ letsencrypt_acme_user }} state=directory recurse=yes

shinyproxy/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 shinyproxy_install: False
-shinyproxy_version: 1.0.0
+shinyproxy_version: 1.0.2
 shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar'
 shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}'
 shinyproxy_app_name: shinyproxy.jar

smartgears/sis_geotk_dt_plugin/defaults/main.yml

@@ -6,8 +6,9 @@ sis_geotk_dt_plugin_group_id : org.gcube.data.transfer
 sis_geotk_dt_plugin_artifact_id : '{{ sis_geotk_dt_plugin_name }}'
 sis_geotk_dt_plugin_version : latest
 sis_geotk_dt_plugin_extension: jar
-sis_geotk_dt_plugin_classifier: jar-with-dependencies
+sis_geotk_dt_plugin_classifier: uberjar
-sis_geotk_dt_plugin_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}-jar-with-dependencies.{{ sis_geotk_dt_plugin_extension }}'
+sis_geotk_dt_plugin_uber_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}-{{ sis_geotk_dt_plugin_classifier }}.{{ sis_geotk_dt_plugin_extension }}'
+sis_geotk_dt_plugin_file: '{{ sis_geotk_dt_plugin_name }}-{{ sis_geotk_dt_plugin_version }}.{{ sis_geotk_dt_plugin_extension }}'
 
 catalina_apps_conf:
   - { app_name: '{{ data_trasfer_service_name }}', plugin_name: '{{ sis_geotk_dt_plugin_name }}' }

smartgears/sis_geotk_dt_plugin/tasks/main.yml

@@ -9,24 +9,31 @@
   tags: [ 'smartgears', 'sis_geotk', 'tomcat' ]
     
 - block:
-    - name: Create the plugin directory inside data transfer
+    - name: Get the Sis geotk data transfer uber plugin
-      file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=directory
+      maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ sis_geotk_dt_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_uber_file }}
-
+      register: sis_geotk_download 
-    - name: Get the Sis geotk data transfer plugin
-      maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version | default(omit) }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ sis_geotk_dt_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }}
-      register: sis_geotk_download
 
     - name: Remove the old Sis geotk data transfer plugin 
       file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=absent
       when: (sis_geotk_download | changed)
 
-    - name: Copy the Sis geotk data transfer plugin to its final destination
+    - name: Create the plugin directory inside data transfer
-      copy: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/{{ sis_geotk_dt_plugin_file }} remote_src=yes
+      file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} state=directory
+
+    - name: Unarchive the Sis geotk data transfer uber plugin to expose its libraries
+      unarchive: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_uber_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/ copy=no
+      when: (sis_geotk_download | changed)
       notify: Restart smartgears
 
-    - name: Unarchive the Sis geotk data transfer plugin to expose its libraries
+    - name: Get the Sis geotk data transfer uber plugin
-      unarchive: src={{ smartgears_downloads_dir }}/{{ sis_geotk_dt_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/ copy=no
+      maven_artifact: artifact_id={{ sis_geotk_dt_plugin_name }} version={{ sis_geotk_dt_plugin_version }} group_id={{ sis_geotk_dt_plugin_group_id }} extension={{ sis_geotk_dt_plugin_extension }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }} keep_name=yes 
-      when: (sis_geotk_download | changed)
+
+    - name: Remove the Sis geotk uber jar org and META-INF directories
+      file: dest={{ smartgears_instance_path }}/webapps/{{ data_trasfer_service_name }}/WEB-INF/lib/plugins/{{ sis_geotk_dt_plugin_name }}/{{ item }} state=absent
+      with_items:
+        - org
+        - 'META-INF'
+      notify: Restart smartgears
 
   become: True
   become_user: '{{ smartgears_user }}'