From 365f73b3ccdb23691efd8051668cd2f138708b17 Mon Sep 17 00:00:00 2001
From: Adeel Malik <amalik@datical.com>
Date: Thu, 1 Feb 2018 23:49:04 -0600
Subject: [PATCH 1/2] bringing forked repo up to date with upstream

---
 .../resources/datical/datical_generic.bat.ftl    | 16 ++++++++++++++++
 .../resources/datical/datical_generic.sh.ftl     | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 src/main/resources/datical/datical_generic.bat.ftl
 create mode 100644 src/main/resources/datical/datical_generic.sh.ftl

diff --git a/src/main/resources/datical/datical_generic.bat.ftl b/src/main/resources/datical/datical_generic.bat.ftl
new file mode 100644
index 0000000..dd532e5
--- /dev/null
+++ b/src/main/resources/datical/datical_generic.bat.ftl
@@ -0,0 +1,16 @@
+<#--
+
+    Copyright 2018 XEBIALABS
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-->
+
+<#assign ddb_audit_user><#if deployed.container.audit_username?has_content>set DDB_AUDIT_USER=${deployed.container.audit_username}</#if></#assign>
+<#assign ddb_audit_pass><#if deployed.container.audit_password?has_content>set DDB_AUDIT_PASS=${deployed.container.audit_password}</#if></#assign>
+<#assign ddb_user><#if deployed.container.username?has_content>set DDB_USER=${deployed.container.username}</#if></#assign>
+<#assign ddb_pass><#if deployed.container.password?has_content>set DDB_PASS=${deployed.container.password}</#if></#assign>
diff --git a/src/main/resources/datical/datical_generic.sh.ftl b/src/main/resources/datical/datical_generic.sh.ftl
new file mode 100644
index 0000000..0aab0d5
--- /dev/null
+++ b/src/main/resources/datical/datical_generic.sh.ftl
@@ -0,0 +1,16 @@
+<#--
+
+    Copyright 2018 XEBIALABS
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-->
+
+<#assign ddb_audit_user><#if deployed.container.audit_username?has_content>export DDB_AUDIT_USER=${deployed.container.audit_username}</#if></#assign>
+<#assign ddb_audit_pass><#if deployed.container.audit_password?has_content>export DDB_AUDIT_PASS=${deployed.container.audit_password}</#if></#assign>
+<#assign ddb_user><#if deployed.container.username?has_content>export DDB_USER=${deployed.container.username}</#if></#assign>
+<#assign ddb_pass><#if deployed.container.password?has_content>export DDB_PASS=${deployed.container.password}</#if></#assign>

From 52fb20359a3f2accd5d8a11ec5b863624bf068a9 Mon Sep 17 00:00:00 2001
From: Adeel Malik <amalik@datical.com>
Date: Fri, 2 Feb 2018 17:36:19 -0600
Subject: [PATCH 2/2] Added functionality to remove passwords from clear text
 and support auditdb runtime credentials

---
 ...ic.bat.ftl => datical_credentials.bat.ftl} |  8 ++---
 ...eric.sh.ftl => datical_credentials.sh.ftl} |  8 ++---
 .../resources/datical/datical_deploy.bat.ftl  | 14 ++++++++
 .../resources/datical/datical_deploy.sh.ftl   | 14 ++++++++
 .../datical/datical_forecast.bat.ftl          | 17 +++++++++-
 .../resources/datical/datical_forecast.sh.ftl | 16 ++++++++-
 .../resources/datical/datical_generic.ftl     |  4 ++-
 .../datical/datical_status_detail.bat.ftl     | 14 ++++++++
 .../datical/datical_status_detail.sh.ftl      | 14 ++++++++
 .../datical/datical_undeploy.bat.ftl          | 12 +++++++
 .../resources/datical/datical_undeploy.sh.ftl |  8 +++++
 .../resources/datical/datical_upload.bat.ftl  |  1 +
 .../datical/daticalweb_status_refresh.bat.ftl | 28 +++++++++++++++
 .../datical/daticalweb_status_refresh.sh.ftl  | 34 +++++++++++++++++++
 src/main/resources/synthetic.xml              |  9 ++++-
 src/main/resources/xl-rules.xml               | 20 +++++++++--
 16 files changed, 206 insertions(+), 15 deletions(-)
 rename src/main/resources/datical/{datical_generic.bat.ftl => datical_credentials.bat.ftl} (74%)
 rename src/main/resources/datical/{datical_generic.sh.ftl => datical_credentials.sh.ftl} (87%)
 create mode 100644 src/main/resources/datical/daticalweb_status_refresh.bat.ftl
 create mode 100644 src/main/resources/datical/daticalweb_status_refresh.sh.ftl

diff --git a/src/main/resources/datical/datical_generic.bat.ftl b/src/main/resources/datical/datical_credentials.bat.ftl
similarity index 74%
rename from src/main/resources/datical/datical_generic.bat.ftl
rename to src/main/resources/datical/datical_credentials.bat.ftl
index dd532e5..9f9c008 100644
--- a/src/main/resources/datical/datical_generic.bat.ftl
+++ b/src/main/resources/datical/datical_credentials.bat.ftl
@@ -10,7 +10,7 @@
  
 -->
 
-<#assign ddb_audit_user><#if deployed.container.audit_username?has_content>set DDB_AUDIT_USER=${deployed.container.audit_username}</#if></#assign>
-<#assign ddb_audit_pass><#if deployed.container.audit_password?has_content>set DDB_AUDIT_PASS=${deployed.container.audit_password}</#if></#assign>
-<#assign ddb_user><#if deployed.container.username?has_content>set DDB_USER=${deployed.container.username}</#if></#assign>
-<#assign ddb_pass><#if deployed.container.password?has_content>set DDB_PASS=${deployed.container.password}</#if></#assign>
+<#assign ddb_audit_user><#if deployed.container.audit_username?has_content>@set DDB_AUDIT_USER=${deployed.container.audit_username}</#if></#assign>
+<#assign ddb_audit_pass><#if deployed.container.audit_password?has_content>@set DDB_AUDIT_PASS=${deployed.container.audit_password}</#if></#assign>
+<#assign ddb_user><#if deployed.container.username?has_content>@set DDB_USER=${deployed.container.username}</#if></#assign>
+<#assign ddb_pass><#if deployed.container.password?has_content>@set DDB_PASS=${deployed.container.password}</#if></#assign>
diff --git a/src/main/resources/datical/datical_generic.sh.ftl b/src/main/resources/datical/datical_credentials.sh.ftl
similarity index 87%
rename from src/main/resources/datical/datical_generic.sh.ftl
rename to src/main/resources/datical/datical_credentials.sh.ftl
index 0aab0d5..f487205 100644
--- a/src/main/resources/datical/datical_generic.sh.ftl
+++ b/src/main/resources/datical/datical_credentials.sh.ftl
@@ -10,7 +10,7 @@
  
 -->
 
-<#assign ddb_audit_user><#if deployed.container.audit_username?has_content>export DDB_AUDIT_USER=${deployed.container.audit_username}</#if></#assign>
-<#assign ddb_audit_pass><#if deployed.container.audit_password?has_content>export DDB_AUDIT_PASS=${deployed.container.audit_password}</#if></#assign>
-<#assign ddb_user><#if deployed.container.username?has_content>export DDB_USER=${deployed.container.username}</#if></#assign>
-<#assign ddb_pass><#if deployed.container.password?has_content>export DDB_PASS=${deployed.container.password}</#if></#assign>
+<#assign ddb_audit_user><#if deployed.container.audit_username?has_content>export DDB_AUDIT_USER=${deployed.container.audit_username} > /dev/null</#if></#assign>
+<#assign ddb_audit_pass><#if deployed.container.audit_password?has_content>export DDB_AUDIT_PASS=${deployed.container.audit_password} > /dev/null</#if></#assign>
+<#assign ddb_user><#if deployed.container.username?has_content>export DDB_USER=${deployed.container.username} > /dev/null</#if></#assign>
+<#assign ddb_pass><#if deployed.container.password?has_content>export DDB_PASS=${deployed.container.password} > /dev/null</#if></#assign>
diff --git a/src/main/resources/datical/datical_deploy.bat.ftl b/src/main/resources/datical/datical_deploy.bat.ftl
index 291311a..9b6211f 100755
--- a/src/main/resources/datical/datical_deploy.bat.ftl
+++ b/src/main/resources/datical/datical_deploy.bat.ftl
@@ -10,4 +10,18 @@
 
 -->
 <#include "/datical/datical_generic.ftl">
+<#include "/datical/datical_credentials.bat.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=%DDB_USER%
+echo DDB_PASS=%DDB_PASS%
+echo DDB_AUDIT_USER=%DDB_AUDIT_USER%
+echo DDB_AUDIT_PASS=%DDB_AUDIT_PASS%
+-->
+<#--
 ${login} -p ${deployed.targetPath} deploy ${environment} ${labels} ${reports} ${pipeline}
+-->
+${login_simple} -p ${deployed.targetPath} deploy ${environment} ${labels} ${reports} ${pipeline}
diff --git a/src/main/resources/datical/datical_deploy.sh.ftl b/src/main/resources/datical/datical_deploy.sh.ftl
index 291311a..7113455 100755
--- a/src/main/resources/datical/datical_deploy.sh.ftl
+++ b/src/main/resources/datical/datical_deploy.sh.ftl
@@ -10,4 +10,18 @@
 
 -->
 <#include "/datical/datical_generic.ftl">
+<#include "/datical/datical_credentials.sh.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=$DDB_USER
+echo DDB_PASS=$DDB_PASS
+echo DDB_AUDIT_USER=$DDB_AUDIT_USER
+echo DDB_AUDIT_PASS=$DDB_AUDIT_PASS
+-->
+<#--
 ${login} -p ${deployed.targetPath} deploy ${environment} ${labels} ${reports} ${pipeline}
+-->
+${login_simple} -p ${deployed.targetPath} deploy ${environment} ${labels} ${reports} ${pipeline}
diff --git a/src/main/resources/datical/datical_forecast.bat.ftl b/src/main/resources/datical/datical_forecast.bat.ftl
index 69e2130..49fe870 100755
--- a/src/main/resources/datical/datical_forecast.bat.ftl
+++ b/src/main/resources/datical/datical_forecast.bat.ftl
@@ -10,4 +10,19 @@
 
 -->
 <#include "/datical/datical_generic.ftl">
-${login} -p ${deployed.targetPath} forecast ${environment} ${labels} ${reports}
+<#include "/datical/datical_credentials.bat.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=%DDB_USER%
+echo DDB_PASS=%DDB_PASS%
+echo DDB_AUDIT_USER=%DDB_AUDIT_USER%
+echo DDB_AUDIT_PASS=%DDB_AUDIT_PASS%
+-->
+<#--
+${login} -p ${deployed.targetPath} forecast ${environment} ${labels} ${reports} ${pipeline}
+-->
+cd ${deployed.targetPath}
+${login_simple} forecast ${environment} ${labels} ${reports} ${pipeline}
diff --git a/src/main/resources/datical/datical_forecast.sh.ftl b/src/main/resources/datical/datical_forecast.sh.ftl
index 69e2130..e793e9e 100755
--- a/src/main/resources/datical/datical_forecast.sh.ftl
+++ b/src/main/resources/datical/datical_forecast.sh.ftl
@@ -10,4 +10,18 @@
 
 -->
 <#include "/datical/datical_generic.ftl">
-${login} -p ${deployed.targetPath} forecast ${environment} ${labels} ${reports}
+<#include "/datical/datical_credentials.sh.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=$DDB_USER
+echo DDB_PASS=$DDB_PASS
+echo DDB_AUDIT_USER=$DDB_AUDIT_USER
+echo DDB_AUDIT_PASS=$DDB_AUDIT_PASS
+-->
+<#--
+${login} -p ${deployed.targetPath} forecast ${environment} ${labels} ${reports} ${pipeline}
+-->
+${login_simple} -p ${deployed.targetPath} forecast ${environment} ${labels} ${reports} ${pipeline}
diff --git a/src/main/resources/datical/datical_generic.ftl b/src/main/resources/datical/datical_generic.ftl
index 9d9b0f8..189e6df 100644
--- a/src/main/resources/datical/datical_generic.ftl
+++ b/src/main/resources/datical/datical_generic.ftl
@@ -13,10 +13,12 @@
 
 <#assign login>${deployed.container.home} <#if deployed.container.username?has_content>-un ${environment}:::${deployed.container.username} -pw ${environment}:::${deployed.container.password}</#if></#assign>
 
+<#assign login_simple>${deployed.container.home} </#assign>
+
 <#assign labels><#if deployed.labels?has_content>--labels="${deployed.labels}"</#if></#assign>
 
 <#assign reports><#if deployed.reportsLocation?has_content>--report="${deployed.reportsLocation}"</#if></#assign>
 
 <#assign pipeline><#if deployed.pipeline?has_content>--pipeline="${deployed.pipeline}"</#if></#assign>
 
-
+<#assign curl><#if deployed.curl_path?has_content>"${deployed.curl_path} --insecure --request POST https://${deployed.daticalweb_host}/service/reporting/qa/v1/audit-db/sync"</#if></#assign>
diff --git a/src/main/resources/datical/datical_status_detail.bat.ftl b/src/main/resources/datical/datical_status_detail.bat.ftl
index f11607f..ef5e86b 100755
--- a/src/main/resources/datical/datical_status_detail.bat.ftl
+++ b/src/main/resources/datical/datical_status_detail.bat.ftl
@@ -10,4 +10,18 @@
 
 -->
 <#include "/datical/datical_generic.ftl">
+<#include "/datical/datical_credentials.bat.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=%DDB_USER%
+echo DDB_PASS=%DDB_PASS%
+echo DDB_AUDIT_USER=%DDB_AUDIT_USER%
+echo DDB_AUDIT_PASS=%DDB_AUDIT_PASS%
+-->
+<#--
 ${login} -p ${deployed.targetPath} statusDetails ${environment}
+-->
+${login_simple} -p ${deployed.targetPath} statusDetails ${environment}
diff --git a/src/main/resources/datical/datical_status_detail.sh.ftl b/src/main/resources/datical/datical_status_detail.sh.ftl
index f11607f..d0bc803 100755
--- a/src/main/resources/datical/datical_status_detail.sh.ftl
+++ b/src/main/resources/datical/datical_status_detail.sh.ftl
@@ -10,4 +10,18 @@
 
 -->
 <#include "/datical/datical_generic.ftl">
+<#include "/datical/datical_credentials.sh.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=$DDB_USER
+echo DDB_PASS=$DDB_PASS
+echo DDB_AUDIT_USER=$DDB_AUDIT_USER
+echo DDB_AUDIT_PASS=$DDB_AUDIT_PASS
+-->
+<#--
 ${login} -p ${deployed.targetPath} statusDetails ${environment}
+-->
+${login_simple} -p ${deployed.targetPath} statusDetails ${environment}
diff --git a/src/main/resources/datical/datical_undeploy.bat.ftl b/src/main/resources/datical/datical_undeploy.bat.ftl
index 41a7478..9dbd772 100755
--- a/src/main/resources/datical/datical_undeploy.bat.ftl
+++ b/src/main/resources/datical/datical_undeploy.bat.ftl
@@ -9,11 +9,23 @@
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -->
+
+<#include "/datical/datical_credentials.bat.ftl">
 <#include "/datical/datical_generic_undeploy.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
 <#if previousDeployed.changeids?size gt 0>
     <#list previousDeployed.changeids as changeid>
+	<#--
     ${login} -p ${previousDeployed.targetPath} rollback ${environment} changeid:id=${changeid}
+	-->
+    ${login_simple} -p ${previousDeployed.targetPath} rollback ${environment} changeid:id=${changeid}
     </#list>
 <#else>
+<#--
 ${login} -p ${previousDeployed.targetPath} rollback ${environment} lastdeploy
+-->
+${login_simple} -p ${previousDeployed.targetPath} rollback ${environment} lastdeploy
 </#if>
diff --git a/src/main/resources/datical/datical_undeploy.sh.ftl b/src/main/resources/datical/datical_undeploy.sh.ftl
index 41a7478..6d6894b 100755
--- a/src/main/resources/datical/datical_undeploy.sh.ftl
+++ b/src/main/resources/datical/datical_undeploy.sh.ftl
@@ -9,11 +9,19 @@
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -->
+
+<#include "/datical/datical_credentials.sh.ftl">
 <#include "/datical/datical_generic_undeploy.ftl">
 <#if previousDeployed.changeids?size gt 0>
     <#list previousDeployed.changeids as changeid>
+	<#--
+    ${login} -p ${previousDeployed.targetPath} rollback ${environment} changeid:id=${changeid}
+	-->
     ${login} -p ${previousDeployed.targetPath} rollback ${environment} changeid:id=${changeid}
     </#list>
 <#else>
+<#--
+${login} -p ${previousDeployed.targetPath} rollback ${environment} lastdeploy
+-->
 ${login} -p ${previousDeployed.targetPath} rollback ${environment} lastdeploy
 </#if>
diff --git a/src/main/resources/datical/datical_upload.bat.ftl b/src/main/resources/datical/datical_upload.bat.ftl
index f6e3388..4c4591e 100755
--- a/src/main/resources/datical/datical_upload.bat.ftl
+++ b/src/main/resources/datical/datical_upload.bat.ftl
@@ -17,6 +17,7 @@
     <#assign ziploc=deployed.container.zipLocation/>
 </#if>
 
+rmdir /S /Q ${deployed.targetPath}
 ${ziploc} x ${deployed.file.path} -aoa -o${deployed.targetPath}
 <#if !deployed.container.zipLocation?has_content>
     rmdir /s /q C:\Temp\7zip
diff --git a/src/main/resources/datical/daticalweb_status_refresh.bat.ftl b/src/main/resources/datical/daticalweb_status_refresh.bat.ftl
new file mode 100644
index 0000000..65d9260
--- /dev/null
+++ b/src/main/resources/datical/daticalweb_status_refresh.bat.ftl
@@ -0,0 +1,28 @@
+<#--
+
+    Copyright 2018 XEBIALABS
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-->
+<#include "/datical/datical_generic.ftl">
+<#include "/datical/datical_credentials.bat.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=%DDB_USER%
+echo DDB_PASS=%DDB_PASS%
+echo DDB_AUDIT_USER=%DDB_AUDIT_USER%
+echo DDB_AUDIT_PASS=%DDB_AUDIT_PASS%
+-->
+<#--
+${login} -p ${deployed.targetPath} status ${environment}
+-->
+${login_simple} -p ${deployed.targetPath} status ${environment}
+${curl}
diff --git a/src/main/resources/datical/daticalweb_status_refresh.sh.ftl b/src/main/resources/datical/daticalweb_status_refresh.sh.ftl
new file mode 100644
index 0000000..4ba30b1
--- /dev/null
+++ b/src/main/resources/datical/daticalweb_status_refresh.sh.ftl
@@ -0,0 +1,34 @@
+<#--
+
+    Copyright 2018 XEBIALABS
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-->
+<#include "/datical/datical_generic.ftl">
+<#include "/datical/datical_credentials.sh.ftl">
+${ddb_audit_user}
+${ddb_audit_pass}
+${ddb_user}
+${ddb_pass}
+<#--
+echo DDB_USER=$DDB_USER
+echo DDB_PASS=$DDB_PASS
+echo DDB_AUDIT_USER=$DDB_AUDIT_USER
+echo DDB_AUDIT_PASS=$DDB_AUDIT_PASS
+-->
+<#--
+${login} -p ${deployed.targetPath} statusDetails ${environment}
+-->
+echo "Refeshing status with Datical Management Console ..."
+if [ "${curl}" != "" ] && [ "${daticalweb}" != "" ]; then
+	${login_simple} -p ${deployed.targetPath} status ${environment}
+	${curl} --insecure --request POST https://${daticalweb}/service/reporting/qa/v1/audit-db/sync
+else
+	echo "INFO: curl Command Path not set. Or Datical Web Hostname not specified."
+fi
+
diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
index 3feab70..bf73764 100644
--- a/src/main/resources/synthetic.xml
+++ b/src/main/resources/synthetic.xml
@@ -25,11 +25,18 @@
                   description="Absolute Path to 7zip.exe (only applicable on Windows). If provided this one will be used, else the prepackaged one will be used."/>
         <property name="envName" label="Environment Name" required="false"
                   description="Environment name to be used for forecast and deploy (e.g. XE)"/>
-
         <property name="username" label="Username" required="false" category="Credentials"
                   description="Database username when the project has the 'Specify database credentials at operation run time' option set." />
         <property name="password" label="Password" required="false" category="Credentials" password="true"
                   description="Database password when the project has the 'Specify database credentials at operation run time' option set." />
+        <property name="audit_username" label="Audit Username" required="false" category="Credentials"
+                  description="Audit database username when the project has the 'Specify database credentials at operation run time' option set." />
+        <property name="audit_password" label="Audit Password" required="false" category="Credentials" password="true"
+                  description="Audit database password when the project has the 'Specify database credentials at operation run time' option set." />
+        <property name="curl_path" label="curl Command Path" required="false" 
+                  description="Fully qualified location of curl CLI command (e.g., C:\apps\Git\mingw64\bin\curl.exe). Required if Datical Web Hostname is specified." />
+        <property name="daticalweb_host" label="Datical Web Hostname" required="false" 
+                  description="The hostname for Datical Management Console (e.g., dmc.datical.net)." />
         <method name="check"
                 delegate="shellScript"
                 host="${thisCi.host}"
diff --git a/src/main/resources/xl-rules.xml b/src/main/resources/xl-rules.xml
index bca3df3..f70dc66 100644
--- a/src/main/resources/xl-rules.xml
+++ b/src/main/resources/xl-rules.xml
@@ -78,7 +78,7 @@
         </steps>
     </rule>
 
-
+<!--
     <rule name="datical.DeployedProject.DESTROY" scope="deployed">
         <conditions>
             <type>datical.DeployedProject</type>
@@ -93,13 +93,11 @@
                     <deployed expression="true">previousDeployed</deployed>
                 </freemarker-context>
             </os-script>
-
             <os-script>
                 <description expression="true">"Undeploy datical %s" % previousDeployed.name</description>
                 <script>datical/datical_undeploy</script>
                 <order>42</order>
             </os-script>
-
             <os-script>
                 <description expression="true">"Remove project [%s] from server" % previousDeployed.name</description>
                 <script>datical/datical_remove</script>
@@ -111,6 +109,7 @@
             </os-script>
         </steps>
     </rule>
+-->
 
     <rule name="datical.DeployedProject.StatusDetail.DESTROY" scope="deployed">
         <conditions>
@@ -131,5 +130,20 @@
         </steps>
     </rule>
 
+	<rule name="datical.DeployedProject.StatusDetail.After.CREATE" scope="deployed">
+        <conditions>
+            <type>datical.DeployedProject</type>
+            <operation>CREATE</operation>
+            <operation>MODIFY</operation>
+        </conditions>
+        <steps>
+            <os-script>
+                <description expression="true">"Refresh Datical Monitoring Console"</description>
+                <script>datical/daticalweb_status_refresh</script>
+                <order>63</order>
+                <upload-artifacts>false</upload-artifacts>
+            </os-script>
+        </steps>
+    </rule>
 
 </rules>