Merged in DCD-1374-context-path-missing-in-confluence.cfg.xml (pull request #153)

add context-path to confluence.cfg.xml

Approved-by: Adam Brokes

roles/confluence_config/molecule/default/converge.yml

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

roles/confluence_config/molecule/default/tests/test_default.py

@@ -38,7 +38,7 @@ def test_server_file(host):
     assert f.exists
     assert f.contains('Connector port="8080"')
     assert f.contains('Server port="8005"')
-    assert f.contains('<Context path=""')
+    assert f.contains('<Context path="foo"')
     assert f.contains('maxThreads="200"')
     assert f.contains('minSpareThreads="10"')
     assert f.contains('connectionTimeout="20000"')
@@ -79,6 +79,7 @@ def test_confluence_config_file(host):
     assert f.contains('<property name="hibernate.connection.url">jdbc:postgresql://postgres-db.ap-southeast-2.rds.amazonaws.com:5432/confluence</property>')
     assert f.contains('<property name="hibernate.connection.password">molecule_password</property>')
     assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
+    assert f.contains('<property name="confluence.webapp.context.path">/foo</property>')
 
 @pytest.mark.parametrize('font', [
 #    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'

roles/confluence_config/templates/confluence.cfg.xml.j2

@@ -37,6 +37,9 @@
     <property name="confluence.cluster.join.type">aws</property>
     <property name="confluence.cluster.name">{{ atl_aws_stack_name }}</property>
     <property name="confluence.cluster.ttl">1</property>
+    {% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %}
+        <property name="confluence.webapp.context.path">/{{ atl_tomcat_contextpath }}</property>
+    {% endif %}
 
   </properties>
-</confluence-configuration>
+</confluence-configuration>