add JAVA_HOME to fedora.env

mlibrary · Dec 19, 2023 · a36bfbd · a36bfbd
1 parent 1e75533
commit a36bfbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/manifests/profile/fulcrum/fedora.pp b/manifests/profile/fulcrum/fedora.pp
@@ -8,6 +8,10 @@
   String $fedora_username = 'fedora',
   String $fedora_password = lookup('nebula::profile::fulcrum::mysql::fedora_password'),
 ) {
+  $jdk_version = lookup('nebula::jdk_version')
+  # used in erb file
+  $java_home = "/usr/lib/jvm/temurin-${jdk_version}-jre-amd64"
+
   ensure_packages([
     'tomcat9-user',
   ])

diff --git a/templates/profile/fulcrum/fedora.env.erb b/templates/profile/fulcrum/fedora.env.erb
@@ -1,4 +1,5 @@
 CATALINA_BASE="/opt/fedora"
+JAVA_HOME="<%= @java_home %>"
 JAVA_OPTS="-Djava.awt.headless=true \
            -Djava.io.tmpdir=/tmp/fedora \
            -Xmx8g \