debfranca
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tomcat-multiple-instances: Add a 'file.encoding' directive to the java options. See https://support.d4science.org/issues/11192

This commit is contained in:
Andrea Dell'Amico 2018-02-15 16:43:16 +01:00
parent 65ed841553
commit be8b0b5178
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tomcat-multiple-instances/defaults/main.yml
View File

@ -43,6 +43,7 @@ tomcat_m_max_threads: 200
tomcat_m_min_heap_size: 2048m
tomcat_m_heap_size: '{{ tomcat_m_min_heap_size }}'
tomcat_m_permgen_size: 512m
tomcat_m_file_encoding: 'UTF-8'
tomcat_m_restart_timeout: 300
# -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 }}"

2
tomcat-multiple-instances/templates/tomcat-default.j2
View File

@ -1,7 +1,7 @@
TOMCAT_USER={{ item.user }}
TOMCAT_GROUP={{ item.user }}
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 %}
JAVA_HEAP="{{ item.java_heap }}"
{% else %}