Skip to content

Commit 9b7b3fa

Browse files
gxy001gxy001
authored
Merge pull request #1 from RogerBestMsft/master
Updated IIS and Sharepoint
2 parents 8133920 + cfbe394 commit 9b7b3fa

8 files changed

+59
-39
lines changed

‎Templates/iis-2vm-sql-1vm/azuredeploy.json

+27-9
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,55 @@
2424
2
2525
],
2626
"defaultValue": 1
27+
},
28+
"uniquePrefix":{
29+
"type": "string",
30+
"metadata": {
31+
"description": "Prefix for uniqueness"
32+
}
33+
},
34+
"_artifactsLocation": {
35+
"type": "string",
36+
"metadata": {
37+
"description": "The base URI where artifacts required by this template are located."
38+
}
39+
},
40+
"_artifactsLocationSasToken": {
41+
"type": "securestring",
42+
"metadata": {
43+
"description": "The sasToken required to access _artifactsLocation. When the template is deployed using the accompanying scripts, a sasToken will be automatically generated."
44+
}
2745
}
2846
},
2947
"variables": {
3048
"apiVersion": "2015-06-15",
3149
"storageName": "[concat('fab', 'stg', uniqueString(resourceGroup().id))]",
3250
"vhdContainer": "vhds",
33-
"virtualNetworkName": "[concat('CONTOSO', 'Vnet')]",
51+
"virtualNetworkName": "[concat(parameters('uniquePrefix'), 'Vnet')]",
3452
"addressPrefix": "10.0.0.0/16",
3553
"feSubnetPrefix": "10.0.0.0/24",
3654
"dbSubnetPrefix": "10.0.2.0/24",
3755
"feNSGName": "feNsg",
3856
"dbNSGName": "dbNsg",
3957
"sqlSrvDBName": "[concat('fab', 'sqlSrv14')]",
4058
"sqlVmSize": "['Standard_DS3_v2']",
41-
"sqlSrvDBOsDiskName": "[concat('CONTOSO', 'DBSrvOS')]",
42-
"sqlSrvDBDataDiskName": "[concat('CONTOSO', 'DBSrvData')]",
59+
"sqlSrvDBOsDiskName": "[concat('db',parameters('uniquePrefix'), 'DBSrvOS')]",
60+
"sqlSrvDBDataDiskName": "[concat('db',parameters('uniquePrefix'), 'DBSrvData')]",
4361
"vnetId": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
44-
"sqlSrvDBNicName": "[concat(variables('sqlSrvDBName'), 'Nic')]",
62+
"sqlSrvDBNicName": "[concat('db',variables('sqlSrvDBName'), 'Nic')]",
4563
"sqlSvrDBSubnetRef": "[concat(variables('vnetId'), '/subnets/', 'DBSubnetName')]",
46-
"sqlPublicIP": "[concat('fab', 'SqlPip')]",
64+
"sqlPublicIP": "[concat('db', 'SqlPip')]",
4765
"sqlPublicIPRef": "[resourceId('Microsoft.Network/publicIPAddresses', variables('sqlPublicIP'))]",
4866
"sqlImagePublisher": "MicrosoftSQLServer",
49-
"sqlImageOffer": "SQL2014-WS2012R2",
67+
"sqlImageOffer": "SQL2014SP2-WS2012R2",
5068
"sqlImageSku": "Standard",
5169
"webSrvName": "[concat('fab', 'webSrv')]",
5270
"webSrvVMSize": "['Standard_DS2_v2']",
5371
"webSrvOSDiks": "[concat('fab', 'WebSrvOS')]",
5472
"webSrvNicName": "[concat(variables('webSrvName'), 'Nic')]",
5573
"webSrvSubnetRef": "[concat(variables('vnetId'), '/subnets/', 'FESubnetName')]",
5674
"webSrvPublicIP": "[concat('fab', 'websrvpip')]",
57-
"webSrvAvailabilitySetName": "[concat('fab', 'webSrvAS')]",
75+
"webSrvAvailabilitySetName": "[concat('fe', 'webSrvAS')]",
5876
"webSrvNumbOfInstances": "[parameters('numberOfWebSrvs')]",
5977
"webSrvDnsNameforLBIP": "[concat(toLower(resourceGroup().name),'lb')]",
6078
"webLbName": "[concat(variables('webSrvName'), 'lb')]",
@@ -65,7 +83,7 @@
6583
"lbPoolID": "[concat(variables('webLbId'),'/backendAddressPools/BackendPool1')]",
6684
"lbProbeID": "[concat(variables('webLbId'),'/probes/tcpProbe')]",
6785
"vmExtensionName": "dscExtension",
68-
"modulesUrl": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/iis-2vm-sql-1vm/scripts/WebServerConfig.ps1.zip",
86+
"modulesUrl":"[concat(parameters('_artifactsLocation'),'/scripts/WebServerConfig.ps1.zip',parameters('_artifactsLocationSasToken'))]",
6987
"configurationFunction": "WebServerConfig.ps1\\WebServerConfig"
7088
},
7189
"resources": [
@@ -274,7 +292,7 @@
274292
}
275293
},
276294
{
277-
"name": "[concat('CONTOSO', 'sqlSrv14')]",
295+
"name": "[concat('be', 'sqlSrv14')]",
278296
"type": "Microsoft.Compute/virtualMachines",
279297
"location": "[resourceGroup().location]",
280298
"apiVersion": "[variables('apiVersion')]",

‎Templates/iis-2vm-sql-1vm/metadata.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"itemDisplayName": "IIS VMs & SQL Server 2014 VM.",
33
"description": "Create 1 or 2 IIS Windows 2012 R2 Web Servers and one back end SQL Server 2014 in VNET.",
4-
"summary": "This template creates one or two Window Server 2012R2 VM(s) with IIS configured using DSC and one SQL Server 2014 standard edition VM.",
5-
"githubUsername": "Central IT"
4+
"summary": "This template creates one or two Window Server 2012R2 VM(s) with IIS configured using DSC and one SQL Server 2014 standard edition VM."
65
}

‎Templates/sharepoint-three-vm/azuredeploy.json

+28-24
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,17 @@
156156
"description": "The DNS Prefix for the SharePoint Public IP Address"
157157
}
158158
},
159-
"baseUrl": {
159+
"_artifactsLocation": {
160160
"type": "string",
161161
"metadata": {
162-
"artifactsBaseUrl": "",
163-
"description": "URL to acquire other templates"
164-
},
165-
"defaultValue": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/sharepoint-three-vm"
162+
"description": "The base URI where artifacts required by this template are located."
163+
}
164+
},
165+
"_artifactsLocationSasToken": {
166+
"type": "securestring",
167+
"metadata": {
168+
"description": "The sasToken required to access _artifactsLocation. When the template is deployed using the accompanying scripts, a sasToken will be automatically generated."
169+
}
166170
},
167171
"spPublicIPNewOrExisting": {
168172
"type": "string",
@@ -209,7 +213,7 @@
209213
}
210214
},
211215
"variables": {
212-
"assetLocation":"[concat(parameters('baseUrl'),'/dsc')]",
216+
"assetLocation":"[concat(parameters('_artifactsLocation'),'/dsc')]",
213217
"configDatabaseName": "SP_Config",
214218
"administrationContentDatabaseName": "SP_AdminContent",
215219
"contentDatabaseName": "spARM_Content",
@@ -289,29 +293,29 @@
289293
"sqlPublicIpResourceId": "[resourceId(concat('Microsoft.Network','/','publicIPAddresses'),variables('sqlpublicIPAddressName'))]",
290294
"spFQDN":"[concat(parameters('spDNSPrefix'),'.',toLower(trim(replace(parameters('location'),' ' ,''))),'.cloudapp.azure.com')]",
291295
"splbResourceId":"[resourceId(concat('Microsoft.Network','/','loadBalancers'),variables('spLBName'))]",
292-
"adModulesURL": "[concat(variables('assetLocation'),'/CreateADPDC.ps1.zip')]",
296+
"adModulesURL": "[concat(variables('assetLocation'),'/CreateADPDC.ps1.zip',parameters('_artifactsLocationSasToken'))]",
293297
"adConfigurationFunction": "CreateADPDC.ps1\\CreateADPDC",
294-
"sqlConfigureModulesURL": "[concat(variables('assetLocation'),'/ConfigureSqlServer.ps1.zip')]",
298+
"sqlConfigureModulesURL": "[concat(variables('assetLocation'),'/ConfigureSqlServer.ps1.zip',parameters('_artifactsLocationSasToken'))]",
295299
"sqlConfigurationFunction": "ConfigureSqlServer.ps1\\ConfigureSqlServer",
296-
"spConfigureModulesURL": "[concat(variables('assetLocation'),'/ConfigureSharePointServer.ps1.zip')]",
300+
"spConfigureModulesURL": "[concat(variables('assetLocation'),'/ConfigureSharePointServer.ps1.zip',parameters('_artifactsLocationSasToken'))]",
297301
"spConfigurationFunction": "ConfigureSharePointServer.ps1\\ConfigureSharePointServer",
298-
"sqlPrepareModulesURL": "[concat(variables('assetLocation'),'/PrepareSqlServer.ps1.zip')]",
302+
"sqlPrepareModulesURL": "[concat(variables('assetLocation'),'/PrepareSqlServer.ps1.zip',parameters('_artifactsLocationSasToken'))]",
299303
"sqlPreparationFunction": "PrepareSqlServer.ps1\\PrepareSqlServer",
300-
"spPrepareModulesURL": "[concat(variables('assetLocation'),'/PrepareSharePointServer.ps1.zip')]",
304+
"spPrepareModulesURL": "[concat(variables('assetLocation'),'/PrepareSharePointServer.ps1.zip',parameters('_artifactsLocationSasToken'))]",
301305
"spPreparationFunction": "PrepareSharePointServer.ps1\\PrepareSharePointServer",
302-
"SettingUpSharepointIPUrl": "[concat(parameters('baseUrl'),'/publicip-',parameters('spPublicIPNewOrExisting'),'.json')]",
303-
"storageAccountSetupURL": "[concat(parameters('baseUrl'),'/storageAccount.json')]",
304-
"creatingPublicIPsUrl": "[concat(parameters('baseUrl'),'/creatingPublicIPs.json')]",
305-
"vnetwithDNSTemplateUrl": "[concat(parameters('baseUrl'),'/vnet-with-dns-server.json')]",
306-
"CreatingAvailabilitySetsUrl": "[concat(parameters('baseUrl'),'/availabilitySets.json')]",
307-
"vnetSetupURL": "[concat(parameters('baseUrl'),'/vnet-new.json')]",
308-
"setupLBsUrl": "[concat(parameters('baseUrl'),'/loadBalancers.json')]",
309-
"creatingNICSUrl": "[concat(parameters('baseUrl'),'/creatingNICS.json')]",
310-
"ProvisioningADDomainControllerUrl": "[concat(parameters('baseUrl'),'/provisioningDomainController.json')]",
311-
"ProvisioningSQLUrl": "[concat(parameters('baseUrl'),'/provisioningSQL.json')]",
312-
"provisioningSharepointUrl": "[concat(parameters('baseUrl'),'/provisioningSharepoint.json')]",
313-
"configuringSQLUrl": "[concat(parameters('baseUrl'),'/configuringSQL.json')]",
314-
"configuringSharepointUrl": "[concat(parameters('baseUrl'),'/configuringSharepoint.json')]"
306+
"SettingUpSharepointIPUrl": "[concat(parameters('_artifactsLocation'),'/publicip-',parameters('spPublicIPNewOrExisting'),'.json',parameters('_artifactsLocationSasToken'))]",
307+
"storageAccountSetupURL": "[concat(parameters('_artifactsLocation'),'/storageAccount.json',parameters('_artifactsLocationSasToken'))]",
308+
"creatingPublicIPsUrl": "[concat(parameters('_artifactsLocation'),'/creatingPublicIPs.json',parameters('_artifactsLocationSasToken'))]",
309+
"vnetwithDNSTemplateUrl": "[concat(parameters('_artifactsLocation'),'/vnet-with-dns-server.json',parameters('_artifactsLocationSasToken'))]",
310+
"CreatingAvailabilitySetsUrl": "[concat(parameters('_artifactsLocation'),'/availabilitySets.json',parameters('_artifactsLocationSasToken'))]",
311+
"vnetSetupURL": "[concat(parameters('_artifactsLocation'),'/vnet-new.json',parameters('_artifactsLocationSasToken'))]",
312+
"setupLBsUrl": "[concat(parameters('_artifactsLocation'),'/loadBalancers.json',parameters('_artifactsLocationSasToken'))]",
313+
"creatingNICSUrl": "[concat(parameters('_artifactsLocation'),'/creatingNICS.json',parameters('_artifactsLocationSasToken'))]",
314+
"ProvisioningADDomainControllerUrl": "[concat(parameters('_artifactsLocation'),'/provisioningDomainController.json',parameters('_artifactsLocationSasToken'))]",
315+
"ProvisioningSQLUrl": "[concat(parameters('_artifactsLocation'),'/provisioningSQL.json',parameters('_artifactsLocationSasToken'))]",
316+
"provisioningSharepointUrl": "[concat(parameters('_artifactsLocation'),'/provisioningSharepoint.json',parameters('_artifactsLocationSasToken'))]",
317+
"configuringSQLUrl": "[concat(parameters('_artifactsLocation'),'/configuringSQL.json',parameters('_artifactsLocationSasToken'))]",
318+
"configuringSharepointUrl": "[concat(parameters('_artifactsLocation'),'/configuringSharepoint.json',parameters('_artifactsLocationSasToken'))]"
315319
},
316320
"resources": [
317321
{

‎Templates/sharepoint-three-vm/dsc/OLDPrepareSharePointServer.ps1.zip

48.7 KB
Binary file not shown.

‎Templates/sharepoint-three-vm/dsc/PrepareSharePointServer.ps1.zip

5.36 KB
Binary file not shown.

‎Templates/sharepoint-three-vm/metadata.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"itemDisplayName": "Three-VM SharePoint 2013 Farm",
33
"description": "This template creates three new Azure VMs, each with a public IP address and load balancer and a VNet, it configures one VM to be an AD DC for a new Forest and Domain, one with SQL Server domain joined and a third VM with a Sharepoint farm and site, all VMs have public facing RDP",
4-
"summary": "This template creates a SharePoint farm",
5-
"githubUsername": "Central IT"
4+
"summary": "This template creates a SharePoint farm"
65
}

‎Templates/sharepoint-three-vm/provisioningSQL.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"storageProfile": {
6464
"imageReference": {
6565
"publisher": "MicrosoftSQLServer",
66-
"offer": "SQL2014SP1-WS2012R2",
66+
"offer": "SQL2014SP2-WS2012R2",
6767
"sku": "Standard",
6868
"version": "latest"
6969
},

‎Templates/sharepoint-three-vm/provisioningSharepoint.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"properties": {
112112
"publisher": "Microsoft.Powershell",
113113
"type": "DSC",
114-
"typeHandlerVersion": "2.17",
114+
"typeHandlerVersion": "2.19",
115115
"autoUpgradeMinorVersion": true,
116116
"settings": {
117117
"ModulesUrl": "[parameters('spPrepareModulesURL')]",

0 commit comments

Comments
 (0)