From 2dd57fed85779f46726bea04b1680ea5f3282405 Mon Sep 17 00:00:00 2001
From: dhcdn <51758091+davidheerema@users.noreply.github.com>
Date: Mon, 24 Feb 2020 09:31:20 -0500
Subject: [PATCH 1/2] Changing names back

changing resource names back
---
 utils/azurescript.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/utils/azurescript.sh b/utils/azurescript.sh
index 740da2002..10801bd1c 100755
--- a/utils/azurescript.sh
+++ b/utils/azurescript.sh
@@ -1,22 +1,23 @@
 #!/bin/bash
 
-export RG_NAME=MpPc-CDS-CyberCrime-rg
+export RG_NAME=MpPcCDSCyberCrimeRg
 
-export ACR_NAME=MpPc-CDSCybercrime-acr 
+export ACR_NAME=MpPcCDSCybercrimeAcr 
 export IMAGE_NAME=f2
 export VIRUS_SCANNER_IMAGE_NAME=clamav
 
-export DB_NAME=MpPc-CDSCybercrime-cosdb
-export BLOB_NAME=MpPc-CDSCybercrime-blob
+export DB_NAME=MpPcCDSCybercrimeCosdb
+export BLOB_NAME=MpPcCDSCybercrimeBlob
 
 
-export PLAN_NAME=MpPc-CDSCybercrime-asp
-export APP_NAME=MpPc-CDSCybercrime-asrv
-export SERVICE_PRINCIPAL_NAME=MpPc-CDSCybercrimeACR-spn
+export PLAN_NAME=MpPcCDSCybercrimeAsp
+export APP_NAME=MpPcCDSCybercrimeAsrv
+export SERVICE_PRINCIPAL_NAME=MpPcCDSCybercrimeAcrSpn
 
-export VIRUS_SCANNER_NAME=MpPc-CDSCybercrimeClamav-ci
+# Container instances can't have caps
+export VIRUS_SCANNER_NAME=mppcdscybercrimeclamavci
 
-export COGNITIVE_NAME=MpPc-CDSCybercrime-cogsrvs 
+export COGNITIVE_NAME=MpPcCDSCybercrimeCogsrvs 
 
 export WAF_RG=MpPCCorenetRg
 export WAF_NAME=MpPCWafGw
@@ -26,7 +27,7 @@ export WAF_SUBSCRIPTION=MpPSub
 export LOG_ANALYTICS=MpPCSecWs
 export LOG_RG=MpPCSeclogRg
 
-export VNET_NAME=MpPc-CDSCybercrime-vn
+export VNET_NAME=MpPcCDSCybercrimeVn
 export VNET_ADDRESS=10.9.0.0/16
 export APP_SUBNET="${APP_NAME}SN"
 export APP_SUBNET_RANGE=10.9.0.0/24

From 27d58259bb63f9a85a8c9f7f6416bce6366f6041 Mon Sep 17 00:00:00 2001
From: dhcdn <51758091+davidheerema@users.noreply.github.com>
Date: Mon, 24 Feb 2020 10:02:26 -0500
Subject: [PATCH 2/2] add uid variables

---
 utils/azurescript.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/utils/azurescript.sh b/utils/azurescript.sh
index 10801bd1c..ab6417484 100755
--- a/utils/azurescript.sh
+++ b/utils/azurescript.sh
@@ -40,6 +40,9 @@ export NOTIFY_API_KEY=
 export NOTIFY_CONFIRMATION_TEMPLATE_ID=
 export SELF_HARM_WORDS=
 
+export LDAP_URL=ldap://pki-dsa.rcmp-grc.gc.ca:389
+export LDAP_UID=
+
 export TAG_ALL="Environment=Production Cost_Centre=S0046 Owner=RCMP Classification=Unclassified Project=RCMP-CDS-FRS Division=HQ"