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

DCD-1299: Align server.xml.j2 value with confluence LTS-ver(7.4.9)

Browse Source
This commit is contained in:
Jun 2021-07-07 17:10:08 +10:00
parent 2675270e7a
commit 22a4776342
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/server.xml.j2
View File

@ -3,13 +3,6 @@
<Server port="{{ atl_tomcat_mgmt_port | default('8000') }}" <Server port="{{ atl_tomcat_mgmt_port | default('8000') }}"
shutdown="SHUTDOWN"> shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.startup.VersionLoggerListener"/>
<Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on"/>
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
<Service name="Catalina"> <Service name="Catalina">
<Connector port="{{ atl_tomcat_port | default('8090') }}" <Connector port="{{ atl_tomcat_port | default('8090') }}"
@ -20,19 +13,13 @@
protocol="{{ atl_tomcat_protocol | default('org.apache.coyote.http11.Http11NioProtocol') }}" protocol="{{ atl_tomcat_protocol | default('org.apache.coyote.http11.Http11NioProtocol') }}"
redirectPort="{{ atl_tomcat_redirectport | default('8443') }}" redirectPort="{{ atl_tomcat_redirectport | default('8443') }}"
acceptCount="{{ atl_tomcat_acceptcount | default('10') }}" acceptCount="{{ atl_tomcat_acceptcount | default('10') }}"
debug="{{ atl_tomcat_debug | default('0') }}"
URIEncoding="{{ atl_tomcat_uriencoding | default('UTF-8') }}"
secure="{{ atl_tomcat_secure | default(catalina_connector_secure) | default('false') }}" secure="{{ atl_tomcat_secure | default(catalina_connector_secure) | default('false') }}"
scheme="{{ atl_tomcat_scheme | default(catalina_connector_scheme) | default('http') }}" scheme="{{ atl_tomcat_scheme | default(catalina_connector_scheme) | default('http') }}"
proxyName="{{ atl_proxy_name | default(catalina_connector_proxyname) | default('') }}" proxyName="{{ atl_proxy_name | default(catalina_connector_proxyname) | default('') }}"
proxyPort="{{ atl_proxy_port | default(catalina_connector_proxyport) | default('') }}" proxyPort="{{ atl_proxy_port | default(catalina_connector_proxyport) | default('') }}"
maxHttpHeaderSize="{{ atl_tomcat_maxhttpheadersize | default('8192') }}" maxHttpHeaderSize="{{ atl_tomcat_maxhttpheadersize | default('8192') }}" />
relaxedPathChars="[]|"
relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
bindOnInit="false"
useBodyEncodingForURI="true"
disableUploadTimeout="true" />

6
tests/test_image.py
View File

@ -72,6 +72,8 @@ def test_server_xml_defaults(docker_cli, image):
assert connector.get('protocol') == 'org.apache.coyote.http11.Http11NioProtocol' assert connector.get('protocol') == 'org.apache.coyote.http11.Http11NioProtocol'
assert connector.get('redirectPort') == '8443' assert connector.get('redirectPort') == '8443'
assert connector.get('acceptCount') == '10' assert connector.get('acceptCount') == '10'
assert connector.get('debug') == '0'
assert connector.get('URIEncoding') == '0'
assert connector.get('secure') == 'false' assert connector.get('secure') == 'false'
assert connector.get('scheme') == 'http' assert connector.get('scheme') == 'http'
assert connector.get('proxyName') == '' assert connector.get('proxyName') == ''
@ -113,6 +115,8 @@ def test_server_xml_params(docker_cli, image):
'ATL_TOMCAT_PROTOCOL': 'HTTP/2', 'ATL_TOMCAT_PROTOCOL': 'HTTP/2',
'ATL_TOMCAT_REDIRECTPORT': '8444', 'ATL_TOMCAT_REDIRECTPORT': '8444',
'ATL_TOMCAT_ACCEPTCOUNT': '11', 'ATL_TOMCAT_ACCEPTCOUNT': '11',
'ATL_TOMCAT_DEBUG': '1',
'ATL_TOMCAT_URIENCODING':'ISO-8859-1',
'ATL_TOMCAT_SECURE': 'true', 'ATL_TOMCAT_SECURE': 'true',
'ATL_TOMCAT_SCHEME': 'https', 'ATL_TOMCAT_SCHEME': 'https',
'ATL_PROXY_NAME': 'conf.atlassian.com', 'ATL_PROXY_NAME': 'conf.atlassian.com',
@ -137,6 +141,8 @@ def test_server_xml_params(docker_cli, image):
assert connector.get('protocol') == environment.get('ATL_TOMCAT_PROTOCOL') assert connector.get('protocol') == environment.get('ATL_TOMCAT_PROTOCOL')
assert connector.get('redirectPort') == environment.get('ATL_TOMCAT_REDIRECTPORT') assert connector.get('redirectPort') == environment.get('ATL_TOMCAT_REDIRECTPORT')
assert connector.get('acceptCount') == environment.get('ATL_TOMCAT_ACCEPTCOUNT') assert connector.get('acceptCount') == environment.get('ATL_TOMCAT_ACCEPTCOUNT')
assert connector.get('debug') == environment.get('ATL_TOMCAT_DEBUG')
assert connector.get('URIEncoding') == environment.get('ATL_TOMCAT_URIENCODING')
assert connector.get('secure') == environment.get('ATL_TOMCAT_SECURE') assert connector.get('secure') == environment.get('ATL_TOMCAT_SECURE')
assert connector.get('scheme') == environment.get('ATL_TOMCAT_SCHEME') assert connector.get('scheme') == environment.get('ATL_TOMCAT_SCHEME')
assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME') assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME')