From a38145bf785633000d3ca8456707d435e2941358 Mon Sep 17 00:00:00 2001 From: Guy Becker Date: Tue, 7 Apr 2020 17:09:09 +0300 Subject: [PATCH 1/6] rename server kind --- azuredeploy.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azuredeploy.json b/azuredeploy.json index f7b8d45..6275823 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -10,7 +10,7 @@ } }, - "serverKind": { + "operatingSystem": { "type": "string", "defaultValue": "linux", "allowedValues": [ @@ -68,7 +68,7 @@ "hostingPlanNameWin": "[concat('hpn-win-', parameters('siteName'))]", "repoURL": "https://github.com/microsoft/HealthBotContainerSample.git", "branch": "master", - "kind": "[if(equals(parameters('serverKind'), 'windows'), 'app', 'linux')]", + "kind": "[if(equals(parameters('operatingSystem'), 'windows'), 'app', 'linux')]", "linuxSiteName": "[concat(parameters('siteName'), 'linux')]", "windowsSiteName": "[concat(parameters('siteName'), 'windows')]", "WinSkuCode": "[parameters('skuName')]", @@ -83,7 +83,7 @@ { "apiVersion": "2018-02-01", "name": "[variables('linuxSiteName')]", - "condition": "[equals(parameters('serverKind'),'linux')]", + "condition": "[equals(parameters('operatingSystem'),'linux')]", "type": "Microsoft.Web/sites", "location": "[parameters('siteLocation')]", "dependsOn": [ @@ -111,7 +111,7 @@ "resources": [ { "type": "sourcecontrols", - "condition": "[equals(parameters('serverKind'),'linux')]", + "condition": "[equals(parameters('operatingSystem'),'linux')]", "apiVersion": "2018-02-01", "name": "web", "location": "[parameters('siteLocation')]", @@ -128,7 +128,7 @@ }, { "apiVersion": "2018-02-01", - "condition": "[equals(parameters('serverKind'),'linux')]", + "condition": "[equals(parameters('operatingSystem'),'linux')]", "name": "[variables('hostingPlanNameLinux')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('siteLocation')]", @@ -144,7 +144,7 @@ }, { "apiVersion": "2018-11-01", - "condition": "[equals(parameters('serverKind'),'windows')]", + "condition": "[equals(parameters('operatingSystem'),'windows')]", "name": "[variables('windowsSiteName')]", "type": "Microsoft.Web/sites", "location": "[parameters('siteLocation')]", @@ -185,7 +185,7 @@ "resources": [ { "type": "sourcecontrols", - "condition": "[equals(parameters('serverKind'),'windows')]", + "condition": "[equals(parameters('operatingSystem'),'windows')]", "apiVersion": "2018-11-01", "name": "web", "location": "[parameters('siteLocation')]", @@ -203,7 +203,7 @@ { "apiVersion": "2018-11-01", "name": "[variables('hostingPlanNameWin')]", - "condition": "[equals(parameters('serverKind'),'windows')]", + "condition": "[equals(parameters('operatingSystem'),'windows')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('siteLocation')]", "kind": "", From a2d3b65f82a27d39732b66f07cbdec061c878f3f Mon Sep 17 00:00:00 2001 From: Guy Becker Date: Tue, 7 Apr 2020 17:13:26 +0300 Subject: [PATCH 2/6] Remove concatination from site name --- azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azuredeploy.json b/azuredeploy.json index 6275823..8476729 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -69,8 +69,8 @@ "repoURL": "https://github.com/microsoft/HealthBotContainerSample.git", "branch": "master", "kind": "[if(equals(parameters('operatingSystem'), 'windows'), 'app', 'linux')]", - "linuxSiteName": "[concat(parameters('siteName'), 'linux')]", - "windowsSiteName": "[concat(parameters('siteName'), 'windows')]", + "linuxSiteName": "parameters('siteName')", + "windowsSiteName": "parameters('siteName')", "WinSkuCode": "[parameters('skuName')]", "WinSku": "Standard", "workerSize": "0", From bbcd52b3b50702745b419e4ccaa2b57af940a16f Mon Sep 17 00:00:00 2001 From: Guy Becker Date: Tue, 7 Apr 2020 17:20:56 +0300 Subject: [PATCH 3/6] add concat --- azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azuredeploy.json b/azuredeploy.json index 8476729..1bd9afa 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -69,8 +69,8 @@ "repoURL": "https://github.com/microsoft/HealthBotContainerSample.git", "branch": "master", "kind": "[if(equals(parameters('operatingSystem'), 'windows'), 'app', 'linux')]", - "linuxSiteName": "parameters('siteName')", - "windowsSiteName": "parameters('siteName')", + "linuxSiteName": "[concat('lin', parameters('siteName'))]", + "windowsSiteName": "[concat('win', parameters('siteName'))]", "WinSkuCode": "[parameters('skuName')]", "WinSku": "Standard", "workerSize": "0", From dd6d661e988677406e9c3f58070e218e3970e582 Mon Sep 17 00:00:00 2001 From: Guy Becker Date: Tue, 7 Apr 2020 17:24:55 +0300 Subject: [PATCH 4/6] remove concat --- azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azuredeploy.json b/azuredeploy.json index 1bd9afa..be931bf 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -69,8 +69,8 @@ "repoURL": "https://github.com/microsoft/HealthBotContainerSample.git", "branch": "master", "kind": "[if(equals(parameters('operatingSystem'), 'windows'), 'app', 'linux')]", - "linuxSiteName": "[concat('lin', parameters('siteName'))]", - "windowsSiteName": "[concat('win', parameters('siteName'))]", + "linuxSiteName": "[parameters('siteName')]", + "windowsSiteName": "[parameters('siteName')]", "WinSkuCode": "[parameters('skuName')]", "WinSku": "Standard", "workerSize": "0", From c2ebbdbd61db595ee46d82e01169a87add938d41 Mon Sep 17 00:00:00 2001 From: Guy Becker Date: Tue, 7 Apr 2020 17:42:45 +0300 Subject: [PATCH 5/6] two names --- azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azuredeploy.json b/azuredeploy.json index be931bf..9ae7795 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -69,8 +69,8 @@ "repoURL": "https://github.com/microsoft/HealthBotContainerSample.git", "branch": "master", "kind": "[if(equals(parameters('operatingSystem'), 'windows'), 'app', 'linux')]", - "linuxSiteName": "[parameters('siteName')]", - "windowsSiteName": "[parameters('siteName')]", + "linuxSiteName": "[if(equals(parameters('operatingSystem'), 'linux'), parameters('siteName'), 'na')]", + "windowsSiteName": "[if(equals(parameters('operatingSystem'), 'windows'), parameters('siteName'), 'na')]", "WinSkuCode": "[parameters('skuName')]", "WinSku": "Standard", "workerSize": "0", From 5a697c09479695c3149d213574ca2fda5f6c56f4 Mon Sep 17 00:00:00 2001 From: Guy Becker Date: Tue, 7 Apr 2020 17:51:38 +0300 Subject: [PATCH 6/6] hpn name change --- azuredeploy.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azuredeploy.json b/azuredeploy.json index 9ae7795..38f1973 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -64,13 +64,13 @@ "skuCode": "[parameters('skuName')]", "numberOfWorkers": "[parameters('numberOfInstances')]", "linuxFxVersion": "NODE|lts", - "hostingPlanNameLinux": "[concat('hpn-', parameters('siteName'))]", - "hostingPlanNameWin": "[concat('hpn-win-', parameters('siteName'))]", + "hostingPlanNameLinux": "[concat('plan-linux-', parameters('siteName'))]", + "hostingPlanNameWin": "[concat('plan-win-', parameters('siteName'))]", "repoURL": "https://github.com/microsoft/HealthBotContainerSample.git", "branch": "master", "kind": "[if(equals(parameters('operatingSystem'), 'windows'), 'app', 'linux')]", - "linuxSiteName": "[if(equals(parameters('operatingSystem'), 'linux'), parameters('siteName'), 'na')]", - "windowsSiteName": "[if(equals(parameters('operatingSystem'), 'windows'), parameters('siteName'), 'na')]", + "linuxSiteName": "[if(equals(parameters('operatingSystem'), 'linux'), parameters('siteName'), 'app-na')]", + "windowsSiteName": "[if(equals(parameters('operatingSystem'), 'windows'), parameters('siteName'), 'app-na')]", "WinSkuCode": "[parameters('skuName')]", "WinSku": "Standard", "workerSize": "0",