From 6ce93e0a323a803022b3167f5f17479841c58824 Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Thu, 9 Apr 2020 14:44:16 +1000
Subject: [PATCH] For DB passwords comprising '&' replace it with '&amp;'

---
 roles/bitbucket_config/templates/bitbucket.properties.j2 | 2 +-
 roles/confluence_config/templates/confluence.cfg.xml.j2  | 1 +
 roles/jira_config/templates/dbconfig.xml.j2              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 444855f..d65135d 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -2,7 +2,7 @@
 jdbc.driver={{ atl_db_driver }}
 jdbc.url={{ atl_jdbc_url }}
 jdbc.user={{ atl_jdbc_user }}
-jdbc.password={{ atl_jdbc_password }}
+jdbc.password={{ atl_jdbc_password | replace("&", "&amp;") }}
 
 hazelcast.network.aws=true
 hazelcast.network.aws.tag.key=Cluster
diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index 4b5368c..10495e1 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -17,6 +17,7 @@
     <property name="hibernate.connection.url">{{ atl_jdbc_url }}</property>
     <property name="hibernate.connection.username">{{ atl_jdbc_user }}</property>
     <property name="hibernate.connection.password">{{ atl_jdbc_password }}</property>
+    <property name="hibernate.connection.password">{{ atl_jdbc_password | replace("&", "&amp;") }}</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.timeout">{{ atl_db_timeout }}</property>
diff --git a/roles/jira_config/templates/dbconfig.xml.j2 b/roles/jira_config/templates/dbconfig.xml.j2
index 8ae7e81..992a3f6 100644
--- a/roles/jira_config/templates/dbconfig.xml.j2
+++ b/roles/jira_config/templates/dbconfig.xml.j2
@@ -8,7 +8,7 @@
   <jdbc-datasource>
     <url>{{ atl_jdbc_url }}</url>
     <username>{{ atl_jdbc_user }}</username>
-    <password>{{ atl_jdbc_password }}</password>
+    <password>{{ atl_jdbc_password | replace("&", "&amp;") }}</password>
     <driver-class>{{ atl_db_driver }}</driver-class>
 
     <pool-min-size>{{ atl_db_poolminsize }}</pool-min-size>