From c1cf0943680763376c796e83f337e9643e1ab699 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert.debock@adfinis.com>
Date: Mon, 3 Mar 2025 21:08:40 +0100
Subject: [PATCH] Place setenv when JAVA_HOME is set. (And export.)

---
 tasks/instance.yml     |  3 ++-
 templates/setenv.sh.j2 | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tasks/instance.yml b/tasks/instance.yml
index 1a6d5fe..20ad9f4 100644
--- a/tasks/instance.yml
+++ b/tasks/instance.yml
@@ -58,7 +58,8 @@
   when:
     - instance.java_opts is defined or
       instance.xms is defined or
-      instance.xmx is defined
+      instance.xmx is defined or
+      instance.java_home is defined
   notify:
     - Restart tomcat instance
 
diff --git a/templates/setenv.sh.j2 b/templates/setenv.sh.j2
index cd8dec6..acf9782 100644
--- a/templates/setenv.sh.j2
+++ b/templates/setenv.sh.j2
@@ -1,8 +1,8 @@
 {{ ansible_managed | comment }}
 
 {% if instance.java_home is defined %}
-JAVA_HOME="{{ instance.java_home }}"
-PATH=$JAVA_HOME/bin:/$PATH
+export JAVA_HOME="{{ instance.java_home }}"
+export PATH=$JAVA_HOME/bin:/$PATH
 {% endif %}
 
 {% if instance.java_opts is defined %}
@@ -12,13 +12,13 @@ PATH=$JAVA_HOME/bin:/$PATH
 {% endif %}
 
 {% if instance.xmx is defined %}
-JAVA_OPTS="-Xmx{{ instance.xmx }} ${JAVA_OPTS}"
+export JAVA_OPTS="-Xmx{{ instance.xmx }} ${JAVA_OPTS}"
 {% else %}
-JAVA_OPTS="-Xmx{{ tomcat_xmx }} ${JAVA_OPTS}"
+export JAVA_OPTS="-Xmx{{ tomcat_xmx }} ${JAVA_OPTS}"
 {% endif %}
 
 {% if instance.xms is defined %}
-JAVA_OPTS="-Xms{{ instance.xms }} ${JAVA_OPTS}"
+export JAVA_OPTS="-Xms{{ instance.xms }} ${JAVA_OPTS}"
 {% else %}
-JAVA_OPTS="-Xms{{ tomcat_xms }} ${JAVA_OPTS}"
+export JAVA_OPTS="-Xms{{ tomcat_xms }} ${JAVA_OPTS}"
 {% endif %}