forked from ISTI-ansible-roles/ansible-roles
tomcat-multiple-instances: Add a 'file.encoding' directive to the java options. See https://support.d4science.org/issues/11192
This commit is contained in:
parent
65ed841553
commit
be8b0b5178
tomcat-multiple-instances
|
@ -43,6 +43,7 @@ tomcat_m_max_threads: 200
|
||||||
tomcat_m_min_heap_size: 2048m
|
tomcat_m_min_heap_size: 2048m
|
||||||
tomcat_m_heap_size: '{{ tomcat_m_min_heap_size }}'
|
tomcat_m_heap_size: '{{ tomcat_m_min_heap_size }}'
|
||||||
tomcat_m_permgen_size: 512m
|
tomcat_m_permgen_size: 512m
|
||||||
|
tomcat_m_file_encoding: 'UTF-8'
|
||||||
tomcat_m_restart_timeout: 300
|
tomcat_m_restart_timeout: 300
|
||||||
# -server -Djava.awt.headless=true are always used. No need to specify them
|
# -server -Djava.awt.headless=true are always used. No need to specify them
|
||||||
tomcat_m_java_opts_heap: "-Xms{{ tomcat_m_min_heap_size }} -Xmx{{ tomcat_m_heap_size }}"
|
tomcat_m_java_opts_heap: "-Xms{{ tomcat_m_min_heap_size }} -Xmx{{ tomcat_m_heap_size }}"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
TOMCAT_USER={{ item.user }}
|
TOMCAT_USER={{ item.user }}
|
||||||
TOMCAT_GROUP={{ item.user }}
|
TOMCAT_GROUP={{ item.user }}
|
||||||
JAVA_HOME={{ item.java_home }}
|
JAVA_HOME={{ item.java_home }}
|
||||||
JAVA_OPTS="-server -Djava.awt.headless=true"
|
JAVA_OPTS="-server -Djava.awt.headless=true -Dfile.encoding={{ tomcat_m_file_encoding }}"
|
||||||
{% if item.java_heap is defined %}
|
{% if item.java_heap is defined %}
|
||||||
JAVA_HEAP="{{ item.java_heap }}"
|
JAVA_HEAP="{{ item.java_heap }}"
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
Loading…
Reference in New Issue