From 8df72504290d322298f097e6788c81204d347790 Mon Sep 17 00:00:00 2001
From: vimukthi <ashbournerox@gmail.com>
Date: Fri, 26 Jul 2019 13:56:32 +0530
Subject: [PATCH] Parameterize consent management configs

---
 .../conf/consent-mgt-config.xml.erb           | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pattern-1/bosh-release/jobs/wso2is/templates/repository/conf/consent-mgt-config.xml.erb b/pattern-1/bosh-release/jobs/wso2is/templates/repository/conf/consent-mgt-config.xml.erb
index 2d83be4..c986485 100644
--- a/pattern-1/bosh-release/jobs/wso2is/templates/repository/conf/consent-mgt-config.xml.erb
+++ b/pattern-1/bosh-release/jobs/wso2is/templates/repository/conf/consent-mgt-config.xml.erb
@@ -18,22 +18,23 @@
     <DataSource>
         <!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources
         .xml -->
-        <Name>jdbc/WSO2IdentityDS</Name>
+        <!-- todo: make this optional. Make DataSource name configurable-->
+        <Name>jdbc/WSO2ConsentDS</Name>
     </DataSource>
     <PIIController>
-        <PiiController>change-me</PiiController>
-        <Contact>change-me</Contact>
-        <Email>change-me</Email>
-        <Phone>change-me</Phone>
+        <PiiController><%= p("wso2is.consent_mgt_conf.piicontroller") %></PiiController>
+        <Contact><%= p("wso2is.consent_mgt_conf.contact") %></Contact>
+        <Email><%= p("wso2is.consent_mgt_conf.email") %></Email>
+        <Phone><%= p("wso2is.consent_mgt_conf.phone") %></Phone>
         <OnBehalf>false</OnBehalf>
-        <PiiControllerUrl>change-me</PiiControllerUrl>
+        <PiiControllerUrl><%= p("wso2is.consent_mgt_conf.piicontroller_url") %></PiiControllerUrl>
         <Address>
-            <Country>change-me</Country>
-            <Locality>change-me</Locality>
-            <Region>change-me</Region>
-            <PostOfficeBoxNumber>change-me</PostOfficeBoxNumber>
-            <PostalCode>change-me</PostalCode>
-            <StreetAddress>change-me</StreetAddress>
+            <Country><%= p("wso2is.consent_mgt_conf.country") %></Country>
+            <Locality><%= p("wso2is.consent_mgt_conf.locality") %></Locality>
+            <Region><%= p("wso2is.consent_mgt_conf.region") %></Region>
+            <PostOfficeBoxNumber><%= p("wso2is.consent_mgt_conf.postoffice_box_number") %></PostOfficeBoxNumber>
+            <PostalCode><%= p("wso2is.consent_mgt_conf.postalcode") %></PostalCode>
+            <StreetAddress><%= p("wso2is.consent_mgt_conf.street_address") %></StreetAddress>
         </Address>
     </PIIController>
     <SearchLimits>