From 6545ac29065a8514f1a7411260d3e97e222b1ccf Mon Sep 17 00:00:00 2001 From: Hosung Song Date: Thu, 10 May 2018 08:32:14 -0700 Subject: [PATCH] Fix incorrectly merged base URLs (fixes #100) --- README.md | 10 +++++----- azuredeploy-large-ha.json | 2 +- azuredeploy-maximal.json | 2 +- azuredeploy-minimal.json | 2 +- azuredeploy-small2mid-noha.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 124e6cb..b8a86eb 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ deployment. The number of configuration options might be overwhelming, and we'll detailed sizing guidelines in the future. Some pre-defined/restricted deployment options for typical scenarios follow this. -[![Deploy to Azure Fully Configurable](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Ftshirt-sizing%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.png)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Ftshirt-sizing%2Fazuredeploy.json) +[![Deploy to Azure Fully Configurable](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.png)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy.json) ## Minimal deployment @@ -27,7 +27,7 @@ smaller autoscale web frontend VM sku (1 core) that'll give faster deployment ti in the calculator is the minimum cost. The actual cost will be bigger with potentially autoscaled VMs and network cost. -[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Ftshirt-sizing%2Fazuredeploy-minimal.json) +[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-minimal.json) ## Small-to-mid size deployment (without high availability) @@ -39,7 +39,7 @@ without other options like elastic search or redis cache. The cost of this deplo in the calculator is the minimum cost. The actual cost will be bigger with potentially autoscaled VMs and network cost. -[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Ftshirt-sizing%2Fazuredeploy-small2mid-noha.json) +[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-small2mid-noha.json) ## Large size deployment (with high availability) @@ -51,7 +51,7 @@ without other options like elastic search. The cost of this deployment can be es in the calculator is the minimum cost. The actual cost will be bigger with potentially autoscaled VMs and network cost. -[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Ftshirt-sizing%2Fazuredeploy-large-ha.json) +[![Deploy to Azure Minimally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-large-ha.json) ## Maximal deployment @@ -66,7 +66,7 @@ at [this Azure Pricing Calculator link](https://azure.com/e/e0f959b93ed84eb891dc in the calculator is the minimum cost of this deployment. The actual cost will be bigger with potentially autoscaled VMs, backups, and network cost. -[![Deploy to Azure Maximally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Ftshirt-sizing%2Fazuredeploy-maximal.json) +[![Deploy to Azure Maximally](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FMoodle%2Fmaster%2Fazuredeploy-maximal.json) ## Stack Architecture diff --git a/azuredeploy-large-ha.json b/azuredeploy-large-ha.json index 23da47c..cc0599d 100644 --- a/azuredeploy-large-ha.json +++ b/azuredeploy-large-ha.json @@ -7,7 +7,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/tshirt-sizing/" + "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/master/" }, "_artifactsLocationSasToken": { "type": "securestring", diff --git a/azuredeploy-maximal.json b/azuredeploy-maximal.json index f3670d1..1c32e01 100644 --- a/azuredeploy-maximal.json +++ b/azuredeploy-maximal.json @@ -7,7 +7,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/tshirt-sizing/" + "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/master/" }, "_artifactsLocationSasToken": { "type": "securestring", diff --git a/azuredeploy-minimal.json b/azuredeploy-minimal.json index 7f0e186..b2cb3fd 100644 --- a/azuredeploy-minimal.json +++ b/azuredeploy-minimal.json @@ -7,7 +7,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/tshirt-sizing/" + "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/master/" }, "_artifactsLocationSasToken": { "type": "securestring", diff --git a/azuredeploy-small2mid-noha.json b/azuredeploy-small2mid-noha.json index 5d28d50..5f8202f 100644 --- a/azuredeploy-small2mid-noha.json +++ b/azuredeploy-small2mid-noha.json @@ -7,7 +7,7 @@ "metadata": { "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." }, - "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/tshirt-sizing/" + "defaultValue": "https://raw.githubusercontent.com/Azure/Moodle/master/" }, "_artifactsLocationSasToken": { "type": "securestring",