From eedeab6be2112203e3ab8cccb629ba69a4963087 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Wed, 12 Jul 2017 10:55:50 +0200 Subject: [PATCH] tomcat-instance: possibility to surcharge java path --- tomcat-instance/defaults/main.yml | 1 + tomcat-instance/templates/env.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat-instance/defaults/main.yml b/tomcat-instance/defaults/main.yml index 0f6c7735..6a2ec877 100644 --- a/tomcat-instance/defaults/main.yml +++ b/tomcat-instance/defaults/main.yml @@ -1,4 +1,5 @@ --- +tomcat_instance_java_path: '/usr/lib/jvm/java-7-openjdk-amd64' tomcat_instance_root: '/srv/tomcat' tomcat_instance_shutdown: "{{ tomcat_instance_port | int + 1 }}" tomcat_instance_mps: 256 diff --git a/tomcat-instance/templates/env.j2 b/tomcat-instance/templates/env.j2 index a2e329c8..ea4920f7 100644 --- a/tomcat-instance/templates/env.j2 +++ b/tomcat-instance/templates/env.j2 @@ -2,5 +2,5 @@ # Xmx Max memory allocated to instance. # Xms Allocated memory at startup. # XX:MaxPermSize Memory allocated to internal objects. -JAVA_HOME="/usr/lib/jvm/java-1.7.0-openjdk-amd64" +JAVA_HOME="{{ tomcat_instance_java_path }}" JAVA_OPTS="-server -Xmx{{ tomcat_instance_ram }}m -Xms{{ tomcat_instance_ram }}m -XX:MaxPermSize={{ tomcat_instance_mps }}m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled -Xverify:none"