blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in ITPLT-1404-allow-application-tunnels (pull request #163)

Browse Source 
ITPLT-1404 Allow for use of Application Tunnels - https://support.atlassian.com/organization-administration/docs/configure-application-tunnels/

Approved-by: Geoff Jacobs
Approved-by: Dylan Rathbone
This commit is contained in:
Glenn Stewart
2022-06-01 05:37:17 +00:00
parent 73c6460315 083714c898
commit 9dfdfb2dd1
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/aws_node_local.yml
View File

@@ -125,6 +125,7 @@ atl_proxy_name: "{{ lookup('env', 'ATL_PROXY_NAME') | lower }}"
atl_proxy_port: "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}" atl_proxy_port: "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}"
atl_tomcat_port: "{{ lookup('env', 'ATL_TOMCAT_DEFAULTCONNECTORPORT') or '8080' }}" atl_tomcat_port: "{{ lookup('env', 'ATL_TOMCAT_DEFAULTCONNECTORPORT') or '8080' }}"
atl_ssl_proxy: "{{ lookup('env', 'ATL_SSL_PROXY') or 'false' }}" atl_ssl_proxy: "{{ lookup('env', 'ATL_SSL_PROXY') or 'false' }}"
atl_apptunnel_port: "{{ lookup('env', 'ATL_APPTUNNEL_PORT') or '' }}"
atl_tomcat_acceptcount: "{{ lookup('env', 'ATL_TOMCAT_ACCEPTCOUNT') or '10' }}" atl_tomcat_acceptcount: "{{ lookup('env', 'ATL_TOMCAT_ACCEPTCOUNT') or '10' }}"
atl_tomcat_connectiontimeout: "{{ lookup('env', 'ATL_TOMCAT_CONNECTIONTIMEOUT') or '20000' }}" atl_tomcat_connectiontimeout: "{{ lookup('env', 'ATL_TOMCAT_CONNECTIONTIMEOUT') or '20000' }}"

24
roles/jira_config/templates/server.xml.j2
View File

@@ -22,13 +22,10 @@
acceptCount="{{ atl_tomcat_acceptcount }}" acceptCount="{{ atl_tomcat_acceptcount }}"
secure="{{ atl_tomcat_secure }}" secure="{{ atl_tomcat_secure }}"
scheme="{{ atl_tomcat_scheme }}" scheme="{{ atl_tomcat_scheme }}"
{% if atl_proxy_name is defined and atl_proxy_name != '' %} {% if atl_proxy_name is defined and atl_proxy_name != '' -%}proxyName="{{ atl_proxy_name }}"
proxyName="{{ atl_proxy_name }}" {% endif -%}
{% endif %} {% if atl_proxy_port is defined and atl_proxy_port != '' -%}proxyPort="{{ atl_proxy_port }}"
{% if atl_proxy_port is defined and atl_proxy_port != '' %} {% endif -%}
proxyPort="{{ atl_proxy_port }}"
{% endif %}
relaxedPathChars="[]|" relaxedPathChars="[]|"
relaxedQueryChars="[]|{}^\`"<>" relaxedQueryChars="[]|{}^\`"<>"
bindOnInit="false" bindOnInit="false"
@@ -40,7 +37,6 @@
<Connector port="{{ atl_tomcat_redirectport }}" <Connector port="{{ atl_tomcat_redirectport }}"
protocol="{{ atl_tomcat_protocol }}" protocol="{{ atl_tomcat_protocol }}"
connectionTimeout="{{ atl_tomcat_connectiontimeout }}" connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
relaxedPathChars="[]|" relaxedPathChars="[]|"
relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;" relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
maxHttpHeaderSize="65536" maxHttpHeaderSize="65536"
@@ -50,6 +46,18 @@
compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" /> compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" />
{% endif %} {% endif %}
{% if atl_apptunnel_port is defined and atl_apptunnel_port != '' %}
<Connector port="{{ atl_apptunnel_port }}"
connectionTimeout="20000"
maxThreads="200"
minSpareThreads="10"
enableLookups="false"
acceptCount="10"
URIEncoding="UTF-8"
relaxedPathChars="[]|"
relaxedQueryChars="[]|{}^&#x5c;&#x60;&quot;&lt;&gt;"/>
{% endif %}
<Engine name="Catalina" <Engine name="Catalina"
defaultHost="localhost"> defaultHost="localhost">
<Host name="localhost" <Host name="localhost"