Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc. fixes before releasing geOrchestra 22.0 #99

Merged
merged 2 commits into from
Mar 21, 2022
Merged

Misc. fixes before releasing geOrchestra 22.0 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c30716
mapstore - using the debian package instead of the gh action (#98)
pmauduit Mar 21, 2022
6eb9186
tomcat role - moving to jdk11
pmauduit Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions playbooks/georchestra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions roles/tomcat/tasks/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion roles/tomcat/templates/config-georchestra.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }} \
Expand Down
4 changes: 3 additions & 1 deletion roles/tomcat/templates/config-geoserver.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }} \
Expand Down
1 change: 0 additions & 1 deletion roles/tomcat/templates/tomcat.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down