ISTI-ansible-roles
/
ansible-roles
4
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

library/roles/tomcat-multiple-instances, library/roles/tomcat: Record the remote client IP address into the access log. See https://support.d4science.org/issues/9155

This commit is contained in:
Andrea Dell'Amico 2017-07-04 17:24:23 +02:00
parent d7db253dd8
commit 848b7c94d9
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ tomcat_m_webapps_unpack: False
tomcat_m_start_instances: True tomcat_m_start_instances: True
tomcat_m_enable_instances: True tomcat_m_enable_instances: True
tomcat_m_jndi_pool: False tomcat_m_jndi_pool: False
tomcat_m_direct_access: False
# JMX and debugging # JMX and debugging
tomcat_m_enable_remote_debugging: False tomcat_m_enable_remote_debugging: False

7
tomcat-multiple-instances/templates/tomcat-server.xml.j2
View File

@ -105,8 +105,13 @@
Note: The pattern used is equivalent to using pattern="combined" --> Note: The pattern used is equivalent to using pattern="combined" -->
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access." suffix="log" prefix="localhost_access." suffix="log"
{% if tomcat_m_direct_access %}
pattern="combined" pattern="combined"
rotatable="False" {% else %}
pattern="%t %{org.apache.catalina.AccessLog.RemoteAddr}r %{X-AUSERNAME}o %I %s &quot;%r&quot; %b %{User-Agent}i"
{% endif %}
rotatable="False"
/> />
{% endif %} {% endif %}
</Host> </Host>

1
tomcat/defaults/main.yml
View File

@ -28,6 +28,7 @@ tomcat_webapps_unpack: False
tomcat_ajp_enabled: False tomcat_ajp_enabled: False
tomcat_ajp_port: 8009 tomcat_ajp_port: 8009
tomcat_ajp_address: 127.0.0.1 tomcat_ajp_address: 127.0.0.1
tomcat_direct_access: False
# There is a bug that kills tomcat after 50 days if the shutdown port is enabled # There is a bug that kills tomcat after 50 days if the shutdown port is enabled
# Disable the shutdown port by default # Disable the shutdown port by default
#tomcat_shutdown_port: 8005 #tomcat_shutdown_port: 8005

6
tomcat/templates/tomcat-server.xml.j2
View File

@ -149,8 +149,12 @@
Note: The pattern used is equivalent to using pattern="combined" --> Note: The pattern used is equivalent to using pattern="combined" -->
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access." suffix="log" prefix="localhost_access." suffix="log"
{% if tomcat_direct_access %}
pattern="combined" pattern="combined"
rotatable="False" {% else %}
pattern="%t %{org.apache.catalina.AccessLog.RemoteAddr}r %{X-AUSERNAME}o %I %s &quot;%r&quot; %b %{User-Agent}i"
rotatable="False"
{% endif %}
/> />
{% endif %} {% endif %}
</Host> </Host>