ISTI-ansible-roles
/
ansible-role-tomcat-multiple-instances
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert the change to tomcat-start. Define java_home inside the unit.

This commit is contained in:
Andrea Dell'Amico 2024-08-02 15:07:35 +02:00
parent 891d457958
commit 16d952da5c
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/tomcat-default.j2
View File

@ -1,12 +1,16 @@
{% if tomcat_use_systemd %} {% if not tomcat_use_systemd %}
{% if limits_nofile_value is defined %} {% if limits_nofile_value is defined %}
ulimit -Hn {{ limits_nofile_value }} ulimit -Hn {{ limits_nofile_value }}
ulimit -Sn {{ limits_nofile_value }} ulimit -Sn {{ limits_nofile_value }}
{% endif %} {% endif %}
{% endif %}
TOMCAT_USER={{ item.user }} TOMCAT_USER={{ item.user }}
TOMCAT_GROUP={{ item.user }} TOMCAT_GROUP={{ item.user }}
{% else %}
#!/bin/bash
set -e
{% endif %}
JAVA_HOME={{ item.java_home }} JAVA_HOME={{ item.java_home }}
JRE_HOME={{ item.java_home }}
JAVA_OPTS="-server -Djava.awt.headless=true -Dfile.encoding={{ tomcat_m_file_encoding }}" JAVA_OPTS="-server -Djava.awt.headless=true -Dfile.encoding={{ tomcat_m_file_encoding }}"
{% if jdk_default >= 8 %} {% if jdk_default >= 8 %}
JAVA_OPTS="{{ tomcat_m_additional_java_8_opts }} $JAVA_OPTS" JAVA_OPTS="{{ tomcat_m_additional_java_8_opts }} $JAVA_OPTS"

2
templates/tomcat-service.j2
View File

@ -16,6 +16,8 @@ LimitNOFILE={{ limits_nofile_value }}
Environment="CATALINA_HOME=/usr/share/tomcat{{ tomcat_version }}" Environment="CATALINA_HOME=/usr/share/tomcat{{ tomcat_version }}"
Environment="CATALINA_BASE={{ item.instance_path }}" Environment="CATALINA_BASE={{ item.instance_path }}"
Environment="CATALINA_TMPDIR={{ item.catalina_tmp_directory }}" Environment="CATALINA_TMPDIR={{ item.catalina_tmp_directory }}"
Environment="JAVA_HOME={{ item.java_home }}"
Environment="JRE_HOME={{ item.java_home }}"
Type=simple Type=simple
ExecStartPre=+/usr/libexec/tomcat{{ tomcat_version}}/tomcat-update-policy.sh ExecStartPre=+/usr/libexec/tomcat{{ tomcat_version}}/tomcat-update-policy.sh
ExecStart=/bin/sh /usr/libexec/tomcat{{ tomcat_version }}/tomcat-instance-{{ item.http_port }}-start.sh ExecStart=/bin/sh /usr/libexec/tomcat{{ tomcat_version }}/tomcat-instance-{{ item.http_port }}-start.sh

8
templates/tomcat-start.sh.j2
View File

@ -8,8 +8,8 @@ set -e
# Load the service settings # Load the service settings
. /etc/default/tomcat-instance-{{ item.http_port }} . /etc/default/tomcat-instance-{{ item.http_port }}
# We set JAVA_HOME in /etc/default/tomcat-instance-{{ item.http_port }} # Find the Java installation
# . /usr/libexec/tomcat{{ tomcat_version }}/tomcat-locate-java.sh . /usr/libexec/tomcat{{ tomcat_version }}/tomcat-locate-java.sh
# Set the JSP compiler if configured in the /etc/default/tomcat10 file # Set the JSP compiler if configured in the /etc/default/tomcat10 file
[ -n "$JSP_COMPILER" ] && JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=\"$JSP_COMPILER\"" [ -n "$JSP_COMPILER" ] && JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=\"$JSP_COMPILER\""
@ -22,8 +22,4 @@ SECURITY=""
# Start Tomcat # Start Tomcat
{% if ansible_distribution_version is version_compare('22.04', '<') %}
cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run
{% else %}
cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run $SECURITY cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run $SECURITY
{% endif %}