Place setenv when JAVA_HOME is set. (And export.)

robertdebock · Mar 3, 2025 · c1cf094 · c1cf094
1 parent efe65f6
commit c1cf094
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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 %}