From 7c9eed28c86e1935db282f84da185c693e086005 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 26 Nov 2018 22:34:49 -0800 Subject: [PATCH 1/2] Fixed Azure Government Deployment --- docs/DefaultDeployment.md | 4 ++++ samples/templates/default-azuredeploy.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/DefaultDeployment.md b/docs/DefaultDeployment.md index a22211dc0c..a6d61c80b2 100644 --- a/docs/DefaultDeployment.md +++ b/docs/DefaultDeployment.md @@ -58,6 +58,10 @@ To deploy the backend Cosmos DB, Azure Web App, and FHIR server code, use the bu + + + + The template can also be deployed using PowerShell. Here is an example of how the authorization details from above can be provided: ```PowerShell diff --git a/samples/templates/default-azuredeploy.json b/samples/templates/default-azuredeploy.json index cce26d5c84..f22570c962 100644 --- a/samples/templates/default-azuredeploy.json +++ b/samples/templates/default-azuredeploy.json @@ -110,14 +110,14 @@ } }, "variables": { + "isMAG": "[or(contains(resourceGroup().location,'usgov'),contains(resourceGroup().location,'usdod'))]", "serviceName": "[toLower(parameters('serviceName'))]", "identityResourceId": "[concat(resourceId('Microsoft.Web/sites', variables('serviceName')),'/providers/Microsoft.ManagedIdentity/Identities/default')]", - "keyvaultEndpoint": "[concat('https://', variables('serviceName'), '.vault.azure.net/')]", + "keyvaultEndpoint": "[if(variables('isMAG'), concat('https://', variables('serviceName'), '.vault.usgovcloudapi.net/'), concat('https://', variables('serviceName'), '.vault.azure.net/'))]", "appServicePlanResourceGroup": "[if(empty(parameters('appServicePlanResourceGroup')), resourceGroup().name, parameters('appServicePlanResourceGroup'))]", "appServicePlanName": "[if(empty(parameters('appServicePlanName')),concat(variables('serviceName'),'-asp'),parameters('appServicePlanName'))]", "securityAuthenticationEnabled": "[and(not(empty(parameters('securityAuthenticationAuthority'))),not(empty(parameters('securityAuthenticationAudience'))))]", "deploySourceCode": "[and(not(empty(parameters('repositoryUrl'))),not(empty(parameters('repositoryBranch'))))]", - "isMAG": "[or(contains(resourceGroup().location,'usgov'),contains(resourceGroup().location,'usdod'))]", "deployAppInsights": "[and(parameters('deployApplicationInsights'),not(variables('isMAG')))]", "appInsightsName": "[concat('AppInsights-', variables('serviceName'))]", "staticFhirServerConfigProperties": { From b461d735398e493efe2a91f7281a422386178003 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 26 Nov 2018 22:36:59 -0800 Subject: [PATCH 2/2] Typo on Azure Gov button --- docs/DefaultDeployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DefaultDeployment.md b/docs/DefaultDeployment.md index a6d61c80b2..3a464c95ca 100644 --- a/docs/DefaultDeployment.md +++ b/docs/DefaultDeployment.md @@ -58,7 +58,7 @@ To deploy the backend Cosmos DB, Azure Web App, and FHIR server code, use the bu - +