Merge pull request #706 from AtlasOfLivingAustralia/geoserver-fix-694

Geoserver and geonetwork fix for tomcat_deploy task

Author: matthewandrews

ansible/roles/geonetwork/tasks/main.yml

@@ -32,7 +32,7 @@
     - geonetwork
   when: webserver_nginx
 
-- include: ../../tomcat_deploy/tasks/main.yml war_url='{{ geonetwork_war_url }}' context_path='{{ geonetwork_context_path }}' hostname='{{ geonetwork_hostname }}'
+- include: ../../tomcat_deploy/tasks/main.yml war_url='{{ geonetwork_war_url }}' context_path='{{ geonetwork_context_path }}' hostname='{{ geonetwork_hostname }}' tomcat_deploy_from_url=true
   notify:
     - restart tomcat
   tags:

ansible/roles/geoserver/defaults/main.yml

@@ -1,9 +1,3 @@
-groupId: "org.geoserver.web"
-version: "{{ geoserver_version | default('2.19.2') }}"
-artifactId: "gs-web-app"
-packaging: "war"
-classifier: "war"
-
 geoserver_war_url: "https://repo.osgeo.org/repository/release/org/geoserver/web/gs-web-app/2.19.2/gs-web-app-2.19.2.war"
 geoserver_war_sha1sum: "sha1:db9ce038fb2bea7c67a7012bb338c1447260a2b0"
 

ansible/roles/geoserver/vars/main.yml

@@ -0,0 +1,6 @@
+maven_repo_url: "https://repo.osgeo.org/repository/release/"
+groupId: "org.geoserver.web"
+version: "{{ geoserver_version | default('2.19.2') }}"
+artifactId: "gs-web-app"
+packaging: "war"
+classifier: ""

ansible/roles/tomcat_deploy/tasks/main.yml

@@ -58,8 +58,15 @@
 - name: remove existing webapp (to ensure a clean redeployment)
   file: path="{{ tomcat_deploy_dir }}/{{ war_filename }}.war" state=absent
 
+- name: download from url {{ war_url }}
+  get_url: url={{ war_url }} dest="{{ tomcat_deploy_dir }}/{{ war_filename }}.war" checksum="{{ war_checksum | default('') }}" force=true timeout=60
+  when:
+    - war_local_build is not defined
+    - tomcat_deploy_from_url | default(false)
+  notify:
+    - restart tomcat
+
 - name: download from maven repo {{ war_url }}
-  #get_url: url={{ war_url }} dest="{{ tomcat_deploy_dir }}/{{ war_filename }}.war" checksum="{{ war_checksum | default('') }}" force=true timeout=60
   maven_artifact:
     group_id: "{{groupId | default('au.org.ala')}}"
     artifact_id: "{{artifactId}}"
@@ -73,7 +80,9 @@
     owner: "{{ tomcat_user }}"
     group: "{{ tomcat_user }}"
     verify_checksum: always
-  when: war_local_build is not defined
+  when:
+    - war_local_build is not defined
+    - not tomcat_deploy_from_url | default(false)
   notify:
     - restart tomcat