diff --git a/manifests/profile/fulcrum/fedora.pp b/manifests/profile/fulcrum/fedora.pp index 37ba71ee5..ddc967cc4 100644 --- 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 index 9616d5de5..1f2d54095 100644 --- 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 \