Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

align with the other tomcat configuration environment variables

Browse Source
This commit is contained in:
Karolis Eigelis
2020-02-26 10:12:18 +02:00
parent 3dff504b32
commit a5237d8ed4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/server.xml.j2
View File

@ -50,9 +50,9 @@
<Manager pathname=""/> <Manager pathname=""/>
<Valve className="org.apache.catalina.valves.StuckThreadDetectionValve" <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
threshold="60"/> threshold="60"/>
{% if atl_access_log == 'true' %} {% if atl_tomcat_access_log == 'true' %}
<Valve className="org.apache.catalina.valves.AccessLogValve" requestAttributesEnabled="true" directory="logs" prefix="confluence_access" suffix=".log" rotatable="true" pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" /> <Valve className="org.apache.catalina.valves.AccessLogValve" requestAttributesEnabled="true" directory="logs" prefix="confluence_access" suffix=".log" rotatable="true" pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" />
<Valve className="org.apache.catalina.valves.RemoteIpValve" proxiesHeader="x-forwarded-by" internalProxies="{{ atl_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" /> <Valve className="org.apache.catalina.valves.RemoteIpValve" proxiesHeader="x-forwarded-by" internalProxies="{{ atl_tomcat_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" />
{% endif %} {% endif %}
</Context> </Context>

6
tests/test_image.py
View File

@ -283,8 +283,8 @@ def test_confluence_xml_cluster_tcp(docker_cli, image, run_user):
def test_confluence_xml_access_log(docker_cli, image, run_user): def test_confluence_xml_access_log(docker_cli, image, run_user):
environment = { environment = {
'ATL_ACCESS_LOG': 'true', 'ATL_TOMCAT_ACCESS_LOG': 'true',
'ATL_PROXY_INTERNAL_IPS': '192.168.1.1', 'ATL_TOMCAT_PROXY_INTERNAL_IPS': '192.168.1.1',
} }
container = run_image(docker_cli, image, user=run_user, environment=environment) container = run_image(docker_cli, image, user=run_user, environment=environment)
_jvm = wait_for_proc(container, get_bootstrap_proc(container)) _jvm = wait_for_proc(container, get_bootstrap_proc(container))
@ -292,7 +292,7 @@ def test_confluence_xml_access_log(docker_cli, image, run_user):
xml = parse_xml(container, f'{get_app_home(container)}/server.cfg.xml') xml = parse_xml(container, f'{get_app_home(container)}/server.cfg.xml')
valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']") valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
assert valve.get('internalProxies') == environment.get('ATL_PROXY_INTERNAL_IPS') assert valve.get('internalProxies') == environment.get('ATL_TOMCAT_PROXY_INTERNAL_IPS')
def test_java_in_run_user_path(docker_cli, image): def test_java_in_run_user_path(docker_cli, image):
RUN_USER = 'confluence' RUN_USER = 'confluence'