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

adding confluence access log

Browse Source
This commit is contained in:
Karolis Eigelis 2020-02-20 23:28:11 +02:00
parent 4ed0ef391e
commit 6dadcddc80
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/server.xml.j2
View File

@ -50,6 +50,8 @@
<Manager pathname=""/>
<Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
threshold="60"/>
<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" />
</Context>
<Context path="${confluence.context.path}/synchrony-proxy"

7
tests/test_image.py
View File

@ -50,6 +50,7 @@ def test_server_xml_defaults(docker_cli, image):
xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
connector = xml.find('.//Connector')
context = xml.find('.//Context')
valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
assert connector.get('port') == '8090'
assert connector.get('maxThreads') == '100'
@ -62,7 +63,7 @@ def test_server_xml_defaults(docker_cli, image):
assert connector.get('scheme') == 'http'
assert connector.get('proxyName') == ''
assert connector.get('proxyPort') == ''
assert valve.get('internalProxies') == ''
def test_server_xml_catalina_fallback(docker_cli, image):
environment = {
@ -100,6 +101,7 @@ def test_server_xml_params(docker_cli, image):
'ATL_TOMCAT_SCHEME': 'https',
'ATL_PROXY_NAME': 'conf.atlassian.com',
'ATL_PROXY_PORT': '443',
'ATL_PROXY_INTERNAL_IPS': '192.168.1.1',
'ATL_TOMCAT_CONTEXTPATH': '/myconf',
}
container = run_image(docker_cli, image, environment=environment)
@ -108,6 +110,7 @@ def test_server_xml_params(docker_cli, image):
xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
connector = xml.find('.//Connector')
context = xml.find('.//Context')
valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
assert xml.get('port') == environment.get('ATL_TOMCAT_MGMT_PORT')
@ -123,6 +126,8 @@ def test_server_xml_params(docker_cli, image):
assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME')
assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT')
assert valve.get('internalProxies') == environment.get('ATL_PROXY_INTERNAL_IPS')
assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH')