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

Merged in ITPLT-2221-duplicate-slash (pull request #182)

Browse Source 
ITPLT-2221 Remove the superfluous slash. The atl_tomcat_contextpath varible already contains a slash

Approved-by: James Whitehead
Approved-by: Dylan Rathbone
This commit is contained in:
Glenn Stewart
2022-10-26 03:04:55 +00:00
parent 757e9bb47f fba4bba5bb
commit 7b760e327a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/confluence_config/molecule/default/converge.yml
View File

@@ -16,7 +16,7 @@
atl_autologin_cookie_age: "COOKIEAGE" atl_autologin_cookie_age: "COOKIEAGE"
atl_local_ipv4: "1.1.1.1" atl_local_ipv4: "1.1.1.1"
atl_tomcat_scheme: "http" atl_tomcat_scheme: "http"
atl_tomcat_contextpath: "foo" atl_tomcat_contextpath: "/foo"
atl_proxy_name: "localhost" atl_proxy_name: "localhost"
atl_proxy_port: "80" atl_proxy_port: "80"
atl_db_preferredtestquery: "select 1;" atl_db_preferredtestquery: "select 1;"

2
roles/confluence_config/molecule/default/tests/test_default.py
View File

@@ -38,7 +38,7 @@ def test_server_file(host):
assert f.exists assert f.exists
assert f.contains('Connector port="8080"') assert f.contains('Connector port="8080"')
assert f.contains('Server port="8005"') assert f.contains('Server port="8005"')
assert f.contains('<Context path="foo"') assert f.contains('<Context path="/foo"')
assert f.contains('maxThreads="200"') assert f.contains('maxThreads="200"')
assert f.contains('minSpareThreads="10"') assert f.contains('minSpareThreads="10"')
assert f.contains('connectionTimeout="20000"') assert f.contains('connectionTimeout="20000"')

2
roles/confluence_config/templates/confluence.cfg.xml.j2
View File

@@ -39,7 +39,7 @@
<property name="confluence.cluster.name">{{ atl_aws_stack_name }}</property> <property name="confluence.cluster.name">{{ atl_aws_stack_name }}</property>
<property name="confluence.cluster.ttl">1</property> <property name="confluence.cluster.ttl">1</property>
{% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %} {% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %}
<property name="confluence.webapp.context.path">/{{ atl_tomcat_contextpath }}</property> <property name="confluence.webapp.context.path">{{ atl_tomcat_contextpath }}</property>
{% endif %} {% endif %}
</properties> </properties>