From 923da570a3b6d2e5150da3280902ac0b3a8dc869 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 23 May 2023 14:01:37 +0200 Subject: [PATCH 1/2] add cross layer filtering extension --- defaults/main.yml | 3 +++ tasks/cross-layer-filtering.yml | 27 +++++++++++++++++++++++++++ tasks/main.yml | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 tasks/cross-layer-filtering.yml diff --git a/defaults/main.yml b/defaults/main.yml index 22beb9e..8fc1836 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -37,3 +37,6 @@ geoserver_marlin_renderer_java_options: "-Xbootclasspath/a:{{ geoserver_instance geoserver_geopackage_extension: false geoserver_wps_extension_url: "https://downloads.sourceforge.net/project/geoserver/GeoServer/{{ geoserver_version }}/extensions/geoserver-{{ geoserver_version }}-wps-plugin.zip?ts=gAAAAABkC1uIJnitncxRQD3elbw9wx1nPnrT15OLpG75Hh6D3i3RO1AL66hBcCS9IxNdS_wHnzheIszsYYOyUU6YMiQibCFgBw%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fgeoserver%2Ffiles%2FGeoServer%2F{{ geoserver_version }}%2Fextensions%2Fgeoserver-{{ geoserver_version }}-wps-plugin.zip%2Fdownload" + +geoserver_crosslayer_extension: false +geoserver_querylayer_extension_url: "https://sourceforge.net/projects/geoserver/files/GeoServer/2.10.5/extensions/geoserver-{{ geoserver_version }}-querylayer-plugin.zip/download" diff --git a/tasks/cross-layer-filtering.yml b/tasks/cross-layer-filtering.yml new file mode 100644 index 0000000..e29bb9f --- /dev/null +++ b/tasks/cross-layer-filtering.yml @@ -0,0 +1,27 @@ +--- +- name: Manage the cross-layer extension + block: + - set_fact: + ansible_python_interpreter: /usr/bin/python3.6 + when: ansible_distribution_release == "trusty" + + - name: Download and unpack the Geoserver crossfilter extension + unarchive: copy=no src={{ geoserver_querylayer_extension_url }} dest={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/ creates={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-2.10.5.jar owner={{ item.user }} group={{ item.user }} + with_items: '{{ tomcat_m_instances }}' + notify: tomcat multiple-instances restart + + - set_fact: + ansible_python_interpreter: /usr/bin/python + when: ansible_distribution_release == "trusty" + + when: geoserver_crosslayer_extension + tags: [ 'geoserver', 'geoserver_crossfilter' ] +- block: + - name: Remove the crossfilter extension if not needed + file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-2.10.5.jar state=absent + with_items: '{{ tomcat_m_instances }}' + + when: not geoserver_spatial_install + tags: [ 'geoserver', 'spatialite' ] + + diff --git a/tasks/main.yml b/tasks/main.yml index 98d068b..50e1990 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,5 +4,8 @@ when: geoserver_spatial_install - import_tasks: marlin-renderer.yml when: geoserver_marlin_renderer +- import_tasks: cross-layer-filtering.yml + when: geoserver_crosslayer_extension + -- 2.17.1 From 18b8d64645ec08086c38dd323073103f05f7acc0 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Tue, 6 Jun 2023 11:03:46 +0200 Subject: [PATCH 2/2] add geoserver crosslayer extension tasks --- tasks/cross-layer-filtering.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/cross-layer-filtering.yml b/tasks/cross-layer-filtering.yml index e29bb9f..1a304d2 100644 --- a/tasks/cross-layer-filtering.yml +++ b/tasks/cross-layer-filtering.yml @@ -15,13 +15,13 @@ when: ansible_distribution_release == "trusty" when: geoserver_crosslayer_extension - tags: [ 'geoserver', 'geoserver_crossfilter' ] + tags: [ 'geoserver', 'geoserver_crosslayer' ] - block: - name: Remove the crossfilter extension if not needed file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/gs-querylayer-2.10.5.jar state=absent with_items: '{{ tomcat_m_instances }}' - when: not geoserver_spatial_install - tags: [ 'geoserver', 'spatialite' ] + when: not geoserver_crosslayer_extension + tags: [ 'geoserver', 'geoserver_crosslayer'] -- 2.17.1