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

ITPLT-3356 clean up formatting in c.c.xml

Browse Source
This commit is contained in:
bmeehan
2024-03-08 14:10:18 +11:00
parent da56d513e0
commit 11c23b7169
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@
{% endif -%} {% endif -%}
{# Confluence versions 7.13 and newer #} {# Confluence versions 7.13 and newer #}
{% if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 %} {%- if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 -%}
<property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property> <property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property>
<property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property> <property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property>
<property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property> <property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property>
@@ -35,7 +35,7 @@
<property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property> <property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property>
<property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property> <property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property>
<property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property> <property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property>
{% else %} {%- else -%}
<property name="hibernate.hikari.idleTimeout">{{ atl_db_timeout }}</property> <property name="hibernate.hikari.idleTimeout">{{ atl_db_timeout }}</property>
<property name="hibernate.hikari.maximumPoolSize">{{ atl_db_poolmaxsize }}</property> <property name="hibernate.hikari.maximumPoolSize">{{ atl_db_poolmaxsize }}</property>
<property name="hibernate.hikari.minimumIdle">{{ atl_db_poolminsize }}</property> <property name="hibernate.hikari.minimumIdle">{{ atl_db_poolminsize }}</property>
@@ -54,21 +54,24 @@
<property name="confluence.cluster.join.type">aws</property> <property name="confluence.cluster.join.type">aws</property>
<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 %}
{# config specific to opensearch #} {# config specific to opensearch #}
{% if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %} {%- if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %}
{# if password provided set password and user but NOT region #} {# if password provided set password and user but NOT region #}
{% if atl_opensearch_password is defined and atl_opensearch_password != '' %} {% if atl_opensearch_password is defined and atl_opensearch_password != '' %}
<property name="opensearch.password">{{ atl_opensearch_password }}</property> <property name="opensearch.password">{{ atl_opensearch_password }}</property>
<property name="opensearch.user">{{ atl_opensearch_user }}</property> <property name="opensearch.user">{{ atl_opensearch_user }}</property>
{% else %} {%- else %}
<property name="opensearch.aws.region">{{ atl_hazelcast_network_aws_iam_region }}</property> <property name="opensearch.aws.region">{{ atl_hazelcast_network_aws_iam_region }}</property>
{% endif %} {% endif %}
<property name="opensearch.http.url">https://{{ atl_opensearch_endpoint }}</property> <property name="opensearch.http.url">https://{{ atl_opensearch_endpoint }}</property>
<property name="search.platform">opensearch</property> <property name="search.platform">opensearch</property>
{% endif %} {%- endif %}
{% endif %}
</properties> </properties>
</confluence-configuration> </confluence-configuration>