Skip to content

Commit 85d0c05

Browse files
authored
Merge pull request #90693 from mumian/1004-arm-in-store
update the linked template source
2 parents 5ca3ddd + 5f540de commit 85d0c05

5 files changed

+20
-20
lines changed

articles/azure-resource-manager/deployment-manager-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ There are two services allocated in the west U.S. and the east U.S. locations.
7777
7878
## Download the tutorial files
7979
80-
1. Download [the templates and the artifacts](https://armtutorials.blob.core.windows.net/admtutorial/ADMTutorial.zip) used by this tutorial.
80+
1. Download [the templates and the artifacts](https://github.com/Azure/azure-docs-json-samples/raw/master/tutorial-adm/ADMTutorial.zip) used by this tutorial.
8181
2. Unzip the files to your location computer.
8282
8383
Under the root folder, there are two folders:

articles/azure-resource-manager/resource-manager-tutorial-create-linked-templates.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: azure-resource-manager
1111
ms.workload: multiple
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
14-
ms.date: 03/18/2019
14+
ms.date: 10/04/2019
1515
ms.topic: tutorial
1616
ms.author: jgao
1717
---
@@ -162,7 +162,7 @@ The linked template creates a storage account. The linked template can be used a
162162
163163
## Upload the linked template
164164
165-
The main template and the linked template need to be accessible from where you run the deployment. In this tutorial, you use the Cloud shell deployment method as you used in [Tutorial: Create Azure Resource Manager templates with dependent resources](./resource-manager-tutorial-create-templates-with-dependent-resources.md). The main template (azuredeploy.json) is uploaded to the shell. The linked template (linkedTemplate.json) must be shared somewhere securely. The following PowerShell script creates an Azure Storage account, uploads the template to the Storage account, and then generates a SAS token to grant limited access to the template file. To simplify the tutorial, the script downloads a completed linked template from a shared location. If you want to use the linked template you created, you can use the [Cloud shell](https://shell.azure.com) to upload your linked template, and then modify the script to use your own linked template.
165+
The main template and the linked template need to be accessible from where you run the deployment. In this tutorial, you use the Cloud shell deployment method as you used in [Tutorial: Create Azure Resource Manager templates with dependent resources](./resource-manager-tutorial-create-templates-with-dependent-resources.md). The main template (azuredeploy.json) is uploaded to the shell. The linked template (linkedTemplate.json) must be shared somewhere securely. The following PowerShell script creates an Azure Storage account, uploads the template to the Storage account, and then generates a SAS token to grant limited access to the template file. To simplify the tutorial, the script downloads a completed linked template from a Github repository. If you want to use the linked template you created, you can use the [Cloud shell](https://shell.azure.com) to upload your linked template, and then modify the script to use your own linked template.
166166
167167
> [!NOTE]
168168
> The script limits the SAS token to be used within eight hours. If you need more time to complete this tutorial, increase the expiry time.
@@ -175,7 +175,7 @@ $resourceGroupName = $projectNamePrefix + "rg"
175175
$storageAccountName = $projectNamePrefix + "store"
176176
$containerName = "linkedtemplates" # The name of the Blob container to be created.
177177
178-
$linkedTemplateURL = "https://armtutorials.blob.core.windows.net/linkedtemplates/linkedStorageAccount.json" # A completed linked template used in this tutorial.
178+
$linkedTemplateURL = "https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-linked-templates/linkedStorageAccount.json" # A completed linked template used in this tutorial.
179179
$fileName = "linkedStorageAccount.json" # A file name used for downloading and uploading the linked template.
180180
181181
# Download the tutorial linked template
@@ -255,7 +255,7 @@ The main template is called azuredeploy.json.
255255
"properties": {
256256
"mode": "Incremental",
257257
"templateLink": {
258-
"uri":"https://armtutorials.blob.core.windows.net/linkedtemplates/linkedStorageAccount.json"
258+
"uri":"https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-linked-templates/linkedStorageAccount.json"
259259
},
260260
"parameters": {
261261
"storageAccountName":{"value": "[variables('storageAccountName')]"},

articles/azure-resource-manager/resource-manager-tutorial-deploy-sql-extensions-bacpac.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-resource-manager
55
documentationcenter: ''
66
author: mumian
77
manager: dougeby
8-
editor:
8+
editor:
99

1010
ms.service: azure-resource-manager
1111
ms.workload: multiple
@@ -46,17 +46,17 @@ To complete this article, you need:
4646
4747
## Prepare a BACPAC file
4848
49-
A BACPAC file is shared on an [Azure Storage account](https://armtutorials.blob.core.windows.net/sqlextensionbacpac/SQLDatabaseExtension.bacpac) with the public access. To create your own, see [Export an Azure SQL database to a BACPAC file](../sql-database/sql-database-export.md). If you choose to publish the file to your own location, you must update the template later in the tutorial.
49+
A BACPAC file is shared in [Github](https://github.com/Azure/azure-docs-json-samples/raw/master/tutorial-sql-extension/SQLDatabaseExtension.bacpac). To create your own, see [Export an Azure SQL database to a BACPAC file](../sql-database/sql-database-export.md). If you choose to publish the file to your own location, you must update the template later in the tutorial.
5050
5151
## Open a Quickstart template
5252
53-
The template used in this tutorial is stored in an [Azure Storage account](https://armtutorials.blob.core.windows.net/createsql/azuredeploy.json).
53+
The template used in this tutorial is stored in [Github](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-sql-extension/azuredeploy.json).
5454
5555
1. From Visual Studio Code, select **File**>**Open File**.
5656
2. In **File name**, paste the following URL:
5757
5858
```url
59-
https://armtutorials.blob.core.windows.net/createsql/azuredeploy.json
59+
https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-sql-extension/azuredeploy.json
6060
```
6161
3. Select **Open** to open the file.
6262
@@ -109,7 +109,7 @@ Add two additional resources to the template.
109109
"properties": {
110110
"storageKeyType": "SharedAccessKey",
111111
"storageKey": "?",
112-
"storageUri": "https://armtutorials.blob.core.windows.net/sqlextensionbacpac/SQLDatabaseExtension.bacpac",
112+
"storageUri": "https://github.com/Azure/azure-docs-json-samples/raw/master/tutorial-sql-extension/SQLDatabaseExtension.bacpac",
113113
"administratorLogin": "[variables('databaseServerAdminLogin')]",
114114
"administratorLoginPassword": "[variables('databaseServerAdminLoginPassword')]",
115115
"operationMode": "Import",

articles/azure-resource-manager/resource-manager-tutorial-deploy-vm-extensions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To complete this article, you need:
4444
4545
## Prepare a PowerShell script
4646
47-
A PowerShell script with the following content is shared from an [Azure storage account with public access](https://armtutorials.blob.core.windows.net/usescriptextensions/installWebServer.ps1):
47+
A PowerShell script with the following content is shared from [Github](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-vm-extension/installWebServer.ps1):
4848
4949
```azurepowershell
5050
Install-WindowsFeature -name Web-Server -IncludeManagementTools
@@ -59,7 +59,7 @@ Azure Quickstart Templates is a repository for Resource Manager templates. Inste
5959
1. In Visual Studio Code, select **File** > **Open File**.
6060
1. In the **File name** box, paste the following URL: https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/101-vm-simple-windows/azuredeploy.json
6161

62-
1. To open the file, select **Open**.
62+
1. To open the file, select **Open**.
6363
The template defines five resources:
6464

6565
* **Microsoft.Storage/storageAccounts**. See the [template reference](https://docs.microsoft.com/azure/templates/Microsoft.Storage/storageAccounts).
@@ -92,7 +92,7 @@ Add a virtual machine extension resource to the existing template with the follo
9292
"autoUpgradeMinorVersion":true,
9393
"settings": {
9494
"fileUris": [
95-
"https://armtutorials.blob.core.windows.net/usescriptextensions/installWebServer.ps1"
95+
"https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-vm-extension/installWebServer.ps1"
9696
],
9797
"commandToExecute": "powershell.exe -ExecutionPolicy Unrestricted -File installWebServer.ps1"
9898
}
@@ -105,7 +105,7 @@ For more information about this resource definition, see the [extension referenc
105105
* **name**: Because the extension resource is a child resource of the virtual machine object, the name must have the virtual machine name prefix. See [Set name and type for child resources](child-resource-name-type.md).
106106
* **dependsOn**: Create the extension resource after you've created the virtual machine.
107107
* **fileUris**: The locations where the script files are stored. If you choose not to use the provided location, you need to update the values.
108-
* **commandToExecute**: This command invokes the script.
108+
* **commandToExecute**: This command invokes the script.
109109

110110
## Deploy the template
111111

@@ -114,7 +114,7 @@ For the deployment procedure, see the "Deploy the template" section of [Tutorial
114114
## Verify the deployment
115115

116116
1. In the Azure portal, select the VM.
117-
1. In the VM overview, copy the IP address by selecting **Click to copy**, and then paste it in a browser tab.
117+
1. In the VM overview, copy the IP address by selecting **Click to copy**, and then paste it in a browser tab.
118118
The default Internet Information Services (IIS) welcome page opens:
119119

120120
![The Internet Information Services welcome page](./media/resource-manager-tutorial-deploy-vm-extensions/resource-manager-template-deploy-extensions-customer-script-web-server.png)
@@ -125,7 +125,7 @@ When you no longer need the Azure resources you deployed, clean them up by delet
125125

126126
1. In the Azure portal, in the left pane, select **Resource group**.
127127
2. In the **Filter by name** box, enter the resource group name.
128-
3. Select the resource group name.
128+
3. Select the resource group name.
129129
Six resources are displayed in the resource group.
130130
4. In the top menu, select **Delete resource group**.
131131

articles/azure-resource-manager/resource-manager-tutorial-secure-artifacts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: azure-resource-manager
1111
ms.workload: multiple
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
14-
ms.date: 02/25/2019
14+
ms.date: 10/08/2019
1515
ms.topic: tutorial
1616
ms.author: jgao
1717
---
@@ -61,7 +61,7 @@ To automate these steps using a PowerShell script, see the script from [Upload t
6161
6262
### Download the BACPAC file
6363
64-
Download the [BACPAC file](https://armtutorials.blob.core.windows.net/sqlextensionbacpac/SQLDatabaseExtension.bacpac), and save the file to your local computer with the same name, **SQLDatabaseExtension.bacpac**.
64+
Download the [BACPAC file](https://github.com/Azure/azure-docs-json-samples/raw/master/tutorial-sql-extension/SQLDatabaseExtension.bacpac), and save the file to your local computer with the same name, **SQLDatabaseExtension.bacpac**.
6565
6666
### Create a storage account
6767
@@ -131,13 +131,13 @@ A Blob container is needed before you can upload any files.
131131
132132
## Open an existing template
133133
134-
In this session, you modify the template you created in [Tutorial: Import SQL BACPAC files with Azure Resource Manager templates](./resource-manager-tutorial-deploy-sql-extensions-bacpac.md) to call the BACPAC file with a SAS token. The template developed in the SQL extension tutorial is shared at [https://armtutorials.blob.core.windows.net/sqlextensionbacpac/azuredeploy.json](https://armtutorials.blob.core.windows.net/sqlextensionbacpac/azuredeploy.json).
134+
In this session, you modify the template you created in [Tutorial: Import SQL BACPAC files with Azure Resource Manager templates](./resource-manager-tutorial-deploy-sql-extensions-bacpac.md) to call the BACPAC file with a SAS token. The template developed in the SQL extension tutorial is shared in [GitHub](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-sql-extension/azuredeploy.json).
135135
136136
1. From Visual Studio Code, select **File**>**Open File**.
137137
2. In **File name**, paste the following URL:
138138
139139
```url
140-
https://armtutorials.blob.core.windows.net/sqlextensionbacpac/azuredeploy.json
140+
https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/tutorial-sql-extension/azuredeploy.json
141141
```
142142
3. Select **Open** to open the file.
143143

0 commit comments

Comments
 (0)