Merge pull request #99 from georchestra/misc-fixes-pre-release-22

Misc. fixes before releasing geOrchestra 22.0
georchestra · Mar 21, 2022 · 699270e · 699270e
2 parents 94f08e4 + 6eb9186
commit 699270e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/playbooks/georchestra.yml b/playbooks/georchestra.yml
@@ -158,11 +158,15 @@
         pkg: georchestra-geonetwork
         tomcat: georchestra
         enabled: True
-      mapstore:
-        url: https://api.github.com/repos/{{ mapstore.repo }}/actions/artifacts/{{ mapstore.artifact_id }}/zip
+      # mapstore: # using a github action artifact
+      #   url: https://api.github.com/repos/{{ mapstore.repo }}/actions/artifacts/{{ mapstore.artifact_id }}/zip
+      #   tomcat: georchestra
+      #   artifact_sha256: "{{ mapstore.artifact_sha256 }}"
+      #   enabled: "{{ mapstore.enabled }}"
+      mapstore: # using the package from packages.georchestra.org
+        pkg: georchestra-mapstore
         tomcat: georchestra
-        artifact_sha256: "{{ mapstore.artifact_sha256 }}"
-        enabled: "{{ mapstore.enabled }}"
+        enabled: True
       geoserver:
         pkg: georchestra-geoserver
         tomcat: geoserver

diff --git a/roles/tomcat/tasks/common.yml b/roles/tomcat/tasks/common.yml
@@ -4,45 +4,45 @@
     state: present
 
 - name: add adoptopenjdk repository key
-  tags: java8
+  tags: java
   apt_key:
     url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
 
 - name: add adoptopenjdk debian repo (buster)
-  tags: java8
+  tags: java
   apt_repository:
     repo: "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main"
   when: ansible_distribution_release == "buster"
 
 - name: add adoptopenjdk debian repo (bullseye)
-  tags: java8
+  tags: java
   apt_repository:
     repo: "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main"
   when: ansible_distribution_release == "bullseye"
 
-- name: install java8 from adoptopenjdk (buster)
-  tags: java8
+- name: install java runtimes from adoptopenjdk (buster)
+  tags: java
   apt:
     pkg: [ adoptopenjdk-8-hotspot, adoptopenjdk-11-hotspot ]
     default_release: buster
     update_cache: yes
     state: latest
   when: ansible_distribution_release == "buster"
 
-- name: install java8 from adoptopenjdk (bullseye)
-  tags: java8
+- name: install java runtimes from adoptopenjdk (bullseye)
+  tags: java
   apt:
     pkg: [ adoptopenjdk-8-hotspot, adoptopenjdk-11-hotspot ]
     default_release: bullseye
     update_cache: yes
     state: latest
   when: ansible_distribution_release == "bullseye"
 
-- name: default to adoptopenjdk
-  tags: java8
+- name: default to adoptopenjdk11
+  tags: java
   alternatives:
     name: java
-    path: /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java
+    path: /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/java
 
 - name: installing dependencies
   apt:

diff --git a/roles/tomcat/templates/config-georchestra.j2 b/roles/tomcat/templates/config-georchestra.j2
@@ -1,4 +1,6 @@
-JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64
+JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64
+JRE_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64
+
 JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC \
 	-Xms{{ tomcat_instances.georchestra.xms }} \
 	-Xmx{{ tomcat_instances.georchestra.xmx }} \

diff --git a/roles/tomcat/templates/config-geoserver.j2 b/roles/tomcat/templates/config-geoserver.j2
@@ -1,4 +1,6 @@
-JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64
+JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64
+JRE_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64
+
 JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC \
 	-Xms{{ tomcat_instances.geoserver.xms }} \
 	-Xmx{{ tomcat_instances.geoserver.xmx }} \

diff --git a/roles/tomcat/templates/tomcat.service.j2 b/roles/tomcat/templates/tomcat.service.j2
@@ -9,7 +9,6 @@ User=tomcat
 Group=tomcat
 
 Environment=LANG={{ system_locale }}
-Environment=JRE_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64
 Environment=CATALINA_HOME=/usr/share/tomcat9
 Environment=CATALINA_TMPDIR=/srv/tomcat/%i/temp
 Environment=CATALINA_PID=/run/tomcat/%i.pid