From dfb903d90c024be4ef240d7b536c20205bed0068 Mon Sep 17 00:00:00 2001 From: Anton Pham Date: Wed, 26 Jul 2017 14:34:47 +0800 Subject: [PATCH 1/5] Prompt for user input for the sitecore license and azure parameters files. Just easier to manage file paths on difference machines. --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3058f3bc..84e9bdca 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,9 @@ Below is a sample PowerShell script that can help you to get up and running quic ```PowerShell $ArmTemplateUrl = "AZUREDEPLOY_JSON_URL"; -$ArmParametersPath = ".\xp\azuredeploy.parameters.json"; # read the contents of your Sitecore license file -$licenseFileContent = Get-Content -Raw -Encoding UTF8 -Path ".\license.xml" | Out-String; +$licenseFileContent = Get-Content ((Read-Host "Enter Sitecore license path") -replace '"') -Raw -Encoding UTF8 | Out-String $Name = "RESOURCE_GROUP_NAME"; $location = "AZURE_DATA_CENTER_NAME"; $AzureSubscriptionId = "AZURE_SUBSCRIPTION_ID"; @@ -37,7 +36,7 @@ $AzureSubscriptionId = "AZURE_SUBSCRIPTION_ID"; # license file needs to be secure string and adding the params as a hashtable is the only way to do it $additionalParams = New-Object -TypeName Hashtable; -$params = Get-Content $ArmParametersPath -Raw | ConvertFrom-Json; +$params = Get-Content ((Read-Host "Enter Azure Parameters File") -replace '"') -Raw | ConvertFrom-Json; foreach($p in $params | Get-Member -MemberType *Property) { From 3276b16a6b8a26dbab2bd14b047aa7791acef97d Mon Sep 17 00:00:00 2001 From: Anton Pham Date: Wed, 26 Jul 2017 14:35:33 +0800 Subject: [PATCH 2/5] Get the correct properties from the azure parameters file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 84e9bdca..afa6c49a 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ $additionalParams = New-Object -TypeName Hashtable; $params = Get-Content ((Read-Host "Enter Azure Parameters File") -replace '"') -Raw | ConvertFrom-Json; -foreach($p in $params | Get-Member -MemberType *Property) +foreach($p in $params.parameters | Get-Member -MemberType *Property) { - $additionalParams.Add($p.Name, $params.$($p.Name).value); + $additionalParams.Add($p.Name, $params.parameters.$($p.Name).value); } $additionalParams.Set_Item('licenseXml', $licenseFileContent); From 61d75ea0e126e2df59691beac4c7af67b9143ea9 Mon Sep 17 00:00:00 2001 From: atp0303 Date: Sat, 23 Sep 2017 10:20:32 +0800 Subject: [PATCH 3/5] Update README.md Correct the templateLink as it was resulting in 404 not found. --- AD 1.3.0/xp0/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AD 1.3.0/xp0/README.md b/AD 1.3.0/xp0/README.md index 799ec7fa..f0ee39c2 100644 --- a/AD 1.3.0/xp0/README.md +++ b/AD 1.3.0/xp0/README.md @@ -24,7 +24,7 @@ In order to configure Sitecore deployment parameters to include Active Directory ```JSON { "name": "active-directory", - "templateLink": "https://raw.githubusercontent.com/Sitecore/sitecore-azure-quickstart-templates/master/ad%201.3.0/xp0/azuredeploy.json", + "templateLink": "https://raw.githubusercontent.com/Sitecore/Sitecore-Azure-Quickstart-Templates/master/AD%201.3.0/xp0/azuredeploy.json", "parameters": { "adMsDeployPackageUrl" : "" } From 835b369c46a92773f7bb1a5fc0237017757a8c4c Mon Sep 17 00:00:00 2001 From: atp0303 Date: Sat, 23 Sep 2017 10:28:18 +0800 Subject: [PATCH 4/5] Update README.md update template link as it was resulting in 404 not found --- AD 1.3.0/xp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AD 1.3.0/xp/README.md b/AD 1.3.0/xp/README.md index d12df66d..af386507 100644 --- a/AD 1.3.0/xp/README.md +++ b/AD 1.3.0/xp/README.md @@ -24,7 +24,7 @@ In order to configure Sitecore deployment parameters to include Active Directory ```JSON { "name": "active-directory", - "templateLink": "https://raw.githubusercontent.com/Sitecore/sitecore-azure-quickstart-templates/master/ad%201.3.0/xp/azuredeploy.json", + "templateLink": "https://raw.githubusercontent.com/atp0303/Sitecore-Azure-Quickstart-Templates/master/AD%201.3.0/xp/azuredeploy.json", "parameters": { "adMsDeployPackageUrl" : "" } From 5de5e22a8fec34f4235ef7249cb8a3767f515994 Mon Sep 17 00:00:00 2001 From: atp0303 Date: Sat, 23 Sep 2017 10:29:26 +0800 Subject: [PATCH 5/5] Update README.md update template link as it was resulting in 404 not found --- AD 1.3.0/xm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AD 1.3.0/xm/README.md b/AD 1.3.0/xm/README.md index ab08e42e..1651aefe 100644 --- a/AD 1.3.0/xm/README.md +++ b/AD 1.3.0/xm/README.md @@ -24,7 +24,7 @@ In order to configure Sitecore deployment parameters to include Active Directory ```JSON { "name": "active-directory", - "templateLink": "https://raw.githubusercontent.com/Sitecore/sitecore-azure-quickstart-templates/master/ad%201.3.0/xm/azuredeploy.json", + "templateLink": "https://raw.githubusercontent.com/atp0303/Sitecore-Azure-Quickstart-Templates/master/AD%201.3.0/xm/azuredeploy.json", "parameters": { "adMsDeployPackageUrl" : "" }