From e908677c8879a044520f508d7e275dd60a844a01 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 17 Mar 2017 16:24:35 +0100 Subject: [PATCH] library/roles/geoserver/geoserver: Add the possibility to overwrite specific jars inside the distribution. --- geoserver/geoserver/defaults/main.yml | 1 + geoserver/geoserver/tasks/geoserver.yml | 8 ++++++++ geoserver/geoserver/templates/gcube-app.xml.j2 | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/geoserver/geoserver/defaults/main.yml b/geoserver/geoserver/defaults/main.yml index c5fec9d2..e3612750 100644 --- a/geoserver/geoserver/defaults/main.yml +++ b/geoserver/geoserver/defaults/main.yml @@ -8,3 +8,4 @@ geoserver_download_url: 'http://sourceforge.net/projects/geoserver/files/GeoServ geoserver_download_directory: /srv/geoserver geoserver_data_directory: /srv/geoserver_data + diff --git a/geoserver/geoserver/tasks/geoserver.yml b/geoserver/geoserver/tasks/geoserver.yml index cea51fc7..dc52fe93 100644 --- a/geoserver/geoserver/tasks/geoserver.yml +++ b/geoserver/geoserver/tasks/geoserver.yml @@ -20,6 +20,14 @@ with_items: '{{ tomcat_m_instances }}' notify: tomcat instances restart + - name: Download newer jar files when needed + get_url: url={{ item.1.url }} dest={{ item.0.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/{{ item.1.file }} owner={{ item.0.user }} group={{ item.0.user }} force=yes + with_together: + - '{{ tomcat_m_instances }}' + - '{{ geoserver_patches_data | default ([]) }}' + notify: tomcat instances restart + tags: [ 'geoserver', 'geopatch' ] + when: geoserver_install tags: geoserver diff --git a/geoserver/geoserver/templates/gcube-app.xml.j2 b/geoserver/geoserver/templates/gcube-app.xml.j2 index 0baffcc7..4adf403c 100644 --- a/geoserver/geoserver/templates/gcube-app.xml.j2 +++ b/geoserver/geoserver/templates/gcube-app.xml.j2 @@ -6,7 +6,7 @@ {% if smartgears_persistence_location is defined %} {% endif %} - * + /*