Azure
/
Moodle
зеркало из https://github.com/Azure/Moodle.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use "condition" and remove *0.json

This commit is contained in:
Hosung Song 2018-02-04 20:53:36 -08:00
Родитель 8f07c8a957
Коммит 2358517c9c
17 изменённых файлов: 53 добавлений и 220 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
azuredeploy.json
Просмотреть файл

@ -324,6 +324,7 @@
"type": "Microsoft.Resources/deployments"
},
{
"condition": "[equals(parameters('azureBackupSwitch'),1)]",
"apiVersion": "2015-01-01",
"name": "recoveryTemplate",
"properties": {
@ -334,7 +335,7 @@
}
},
"templateLink": {
"uri": "[concat(variables('moodleCommon').baseTemplateUrl,'recoveryservices',variables('moodleCommon').azureBackupSwitch,'.json')]"
"uri": "[concat(variables('moodleCommon').baseTemplateUrl,'recoveryservices.json')]"
}
},
"type": "Microsoft.Resources/deployments"
@ -582,9 +583,9 @@
"lbDns": "[concat('lb-',variables('resourceprefix'),'.',resourceGroup().location,'.cloudapp.azure.com')]",
"lbName": "[concat('lb-',variables('resourceprefix'))]",
"lbPipName": "[concat('lb-pubip-',variables('resourceprefix'))]",
"moodleAdminPass": "[concat(toUpper('xl'), substring(uniqueString(resourceGroup().id, deployment().name), 6, 7),'<,!1*8')]",
"moodleAdminPass": "[concat(toUpper('xl'), substring(uniqueString(resourceGroup().id, deployment().name), 6, 7),',1*8')]",
"moodleDbName": "moodle",
"moodleDbPass": "[concat('9(#36^', substring(uniqueString(resourceGroup().id, deployment().name), 5, 8), toUpper('ercq'))]",
"moodleDbPass": "[concat('9#36^', substring(uniqueString(resourceGroup().id, deployment().name), 5, 8), toUpper('ercq'))]",
"moodleDbUser": "moodle",
"moodleDbUserAzure": "[concat('moodle', '@', parameters('dbServerType'), '-', variables('resourceprefix'))]",
"moodleInstallScriptFilename": "[concat(parameters('dbServerType'), '_', 'install_moodle.sh')]",

8
nested/controller.json
Просмотреть файл

@ -144,7 +144,7 @@
"dataDisks": [],
"imageReference": "[parameters('moodleCommon').osType]",
"osDisk": {
"createOption": "fromImage",
"createOption": "FromImage",
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
@ -158,6 +158,7 @@
"type": "Microsoft.Compute/virtualMachines"
},
{
"condition": "[equals(parameters('moodleCommon').applyScriptsSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', parameters('moodleCommon').jboxVmName)]"
@ -178,12 +179,13 @@
},
"templateLink": {
"uri": "[concat( parameters('moodleCommon').baseTemplateUrl,'controllerconfig',parameters('moodleCommon').applyScriptsSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'controllerconfig.json')]"
}
},
"type": "Microsoft.Resources/deployments"
},
{
"condition": "[equals(parameters('moodleCommon').azureBackupSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/',parameters('moodleCommon').jboxVmName)]"
@ -200,7 +202,7 @@
}
},
"templateLink": {
"uri": "[concat( parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist',parameters('moodleCommon').azureBackupSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist.json')]"
}
},
"type": "Microsoft.Resources/deployments"

8
nested/controllerconfig1.json → nested/controllerconfig.json
Просмотреть файл

@ -28,15 +28,15 @@
"name": "[concat(parameters('moodleCommon').jboxVmName,'/','install_moodle')]",
"properties": {
"autoUpgradeMinorVersion": true,
"publisher": "Microsoft.OSTCExtensions",
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('cmdExec')]",
"fileUris": [
"[variables('scriptUri')]"
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4"
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"tags": {
"displayName": "install_moodle"
@ -57,7 +57,7 @@
"documentation09": " moodleDbName - database name for moodle",
"documentation10": " moodleDbUser - database user for moodle",
"documentation11": " moodleDbPass - database password for moodleDbUser",
"documentation11": " moodleAdminPass - password for moodle admin user",
"documentation12": " moodleAdminPass - password for moodle admin user",
"scriptUri": "[concat(parameters('moodleCommon').ScriptLocation,parameters('moodleCommon').moodleInstallScriptFilename)]"
}
}

30
nested/controllerconfig0.json
Просмотреть файл

@ -1,30 +0,0 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
},
"blobStorageAccountKey": {
"metadata": {
"description": "Key used to create a storage container"
},
"type": "string"
},
"redisPrimaryKey": {
"metadata": {
"description": "Key used for Redis authentication"
},
"type": "string"
}
},
"resources": [],
"variables": {
"documentation1": "This sub-template intentionally blank - a blank template allows for an optional exectuion strategy",
"documentation2": "",
"documentation3": "You should look for a template of the same name, but with a 1 instead of a 0 (at the end)"
}
}

36
nested/elastic.json
Просмотреть файл

@ -70,7 +70,7 @@
"dataDisks": [],
"imageReference": "[parameters('moodleCommon').osType]",
"osDisk": {
"createOption": "fromImage",
"createOption": "FromImage",
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
@ -84,6 +84,7 @@
"type": "Microsoft.Compute/virtualMachines"
},
{
"condition": "[equals(parameters('moodleCommon').applyScriptsSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', parameters('moodleCommon').elasticVmName1)]"
@ -98,12 +99,13 @@
},
"templateLink": {
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'elasticconfig',parameters('moodleCommon').applyScriptsSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'elasticconfig.json')]"
}
},
"type": "Microsoft.Resources/deployments"
},
{
"condition": "[equals(parameters('moodleCommon').azureBackupSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/',parameters('moodleCommon').elasticVmName1)]"
@ -120,7 +122,7 @@
}
},
"templateLink": {
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist',parameters('moodleCommon').azureBackupSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist.json')]"
}
},
"type": "Microsoft.Resources/deployments"
@ -175,7 +177,7 @@
"dataDisks": [],
"imageReference": "[parameters('moodleCommon').osType]",
"osDisk": {
"createOption": "fromImage",
"createOption": "FromImage",
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
@ -189,6 +191,7 @@
"type": "Microsoft.Compute/virtualMachines"
},
{
"condition": "[equals(parameters('moodleCommon').applyScriptsSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', parameters('moodleCommon').elasticVmName2)]"
@ -203,12 +206,13 @@
},
"templateLink": {
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'elasticconfig',parameters('moodleCommon').applyScriptsSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'elasticconfig.json')]"
}
},
"type": "Microsoft.Resources/deployments"
},
{
"condition": "[equals(parameters('moodleCommon').azureBackupSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/',parameters('moodleCommon').elasticVmName2)]"
@ -225,7 +229,7 @@
}
},
"templateLink": {
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist',parameters('moodleCommon').azureBackupSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist.json')]"
}
},
"type": "Microsoft.Resources/deployments"
@ -280,7 +284,7 @@
"dataDisks": [],
"imageReference": "[parameters('moodleCommon').osType]",
"osDisk": {
"createOption": "fromImage",
"createOption": "FromImage",
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
@ -294,6 +298,7 @@
"type": "Microsoft.Compute/virtualMachines"
},
{
"condition": "[equals(parameters('moodleCommon').applyScriptsSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', parameters('moodleCommon').elasticVmName3)]"
@ -308,12 +313,13 @@
},
"templateLink": {
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'elasticconfig',parameters('moodleCommon').applyScriptsSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'elasticconfig.json')]"
}
},
"type": "Microsoft.Resources/deployments"
},
{
"condition": "[equals(parameters('moodleCommon').azureBackupSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/',parameters('moodleCommon').elasticVmName3)]"
@ -330,7 +336,7 @@
}
},
"templateLink": {
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist',parameters('moodleCommon').azureBackupSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist.json')]"
}
},
"type": "Microsoft.Resources/deployments"
@ -348,12 +354,12 @@
"documentation09": " elasticVmName1 - name of the eastlic vm 1",
"documentation10": " elasticVmName2 - name of the eastlic vm 2",
"documentation11": " elasticVmName3 - name of the eastlic vm 3",
"documentation09": " elasticVm1IP - IP of the eastlic vm 1",
"documentation10": " elasticVm2IP - IP of the eastlic vm 2",
"documentation11": " elasticVm3IP - IP of the eastlic vm 3",
"documentation12": "This sub-template calls other sub-templates",
"documentation13": " elasticconfig - conditionally applies post-deployment script on the VM",
"documentation14": " recoveryservicesEnlist - conditionally enlists the VM into the backup regimen",
"documentation12": " elasticVm1IP - IP of the eastlic vm 1",
"documentation13": " elasticVm2IP - IP of the eastlic vm 2",
"documentation14": " elasticVm3IP - IP of the eastlic vm 3",
"documentation15": "This sub-template calls other sub-templates",
"documentation16": " elasticconfig - conditionally applies post-deployment script on the VM",
"documentation17": " recoveryservicesEnlist - conditionally enlists the VM into the backup regimen",
"nicRef1": "[resourceId('Microsoft.Network/networkInterfaces', parameters('moodleCommon').elasticNicName1)]",
"nicRef2": "[resourceId('Microsoft.Network/networkInterfaces', parameters('moodleCommon').elasticNicName2)]",
"nicRef3": "[resourceId('Microsoft.Network/networkInterfaces', parameters('moodleCommon').elasticNicName3)]",

18
nested/elasticconfig1.json → nested/elasticconfig.json
Просмотреть файл

@ -16,15 +16,15 @@
"name": "[concat(parameters('moodleCommon').elasticVmName1,'/','install_elastic')]",
"properties": {
"autoUpgradeMinorVersion": true,
"publisher": "Microsoft.OSTCExtensions",
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('cmdExec')]",
"fileUris": [
"[variables('scriptUri')]"
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4"
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"tags": {
"displayName": "install_elastic"
@ -37,15 +37,15 @@
"name": "[concat(parameters('moodleCommon').elasticVmName2,'/','install_elastic')]",
"properties": {
"autoUpgradeMinorVersion": true,
"publisher": "Microsoft.OSTCExtensions",
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('cmdExec')]",
"fileUris": [
"[variables('scriptUri')]"
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4"
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"tags": {
"displayName": "install_elastic"
@ -58,15 +58,15 @@
"name": "[concat(parameters('moodleCommon').elasticVmName3,'/','install_elastic')]",
"properties": {
"autoUpgradeMinorVersion": true,
"publisher": "Microsoft.OSTCExtensions",
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('cmdExec')]",
"fileUris": [
"[variables('scriptUri')]"
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4"
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"tags": {
"displayName": "install_elastic"

18
nested/elasticconfig0.json
Просмотреть файл

@ -1,18 +0,0 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
}
},
"resources": [],
"variables": {
"documentation1": "This sub-template intentionally blank - a blank template allows for an optional exectuion strategy",
"documentation2": "",
"documentation3": "You should look for a template of the same name, but with a 1 instead of a 0 (at the end)"
}
}

8
nested/glustervm.json
Просмотреть файл

@ -121,7 +121,7 @@
"dataDisks": "[reference(concat(variables('vmName'),'-diskSelection')).outputs.dataDiskArray.value]",
"imageReference": "[parameters('moodleCommon').osType]",
"osDisk": {
"createOption": "fromImage",
"createOption": "FromImage",
"managedDisk": {
"storageAccountType": "Premium_LRS"
},
@ -135,6 +135,7 @@
"type": "Microsoft.Compute/virtualMachines"
},
{
"condition": "[equals(parameters('moodleCommon').applyScriptsSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/',variables('vmName'))]"
@ -154,12 +155,13 @@
}
},
"templateLink": {
"uri": "[concat( parameters('moodleCommon').baseTemplateUrl,'glustervmconfig',parameters('moodleCommon').applyScriptsSwitch,'.json')]"
"uri": "[concat( parameters('moodleCommon').baseTemplateUrl,'glustervmconfig.json')]"
}
},
"type": "Microsoft.Resources/deployments"
},
{
"condition": "[equals(parameters('moodleCommon').azureBackupSwitch,1)]",
"apiVersion": "2015-01-01",
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/',variables('vmName'))]"
@ -176,7 +178,7 @@
}
},
"templateLink": {
"uri": "[concat( parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist',parameters('moodleCommon').azureBackupSwitch,'.json')]"
"uri": "[concat(parameters('moodleCommon').baseTemplateUrl,'recoveryservicesEnlist.json')]"
}
},
"type": "Microsoft.Resources/deployments"

6
nested/glustervmconfig1.json → nested/glustervmconfig.json
Просмотреть файл

@ -27,15 +27,15 @@
"location": "[resourceGroup().location]",
"name": "[concat(parameters('vmName'),'/','install_gluster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('cmdExec')]",
"fileUris": [
"[variables('scriptUri')]"
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.3"
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"tags": {
"displayName": "GfsVmExtension"

30
nested/glustervmconfig0.json
Просмотреть файл

@ -1,30 +0,0 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
},
"vmName": {
"metadata": {
"description": "Name of VM to process script"
},
"type": "string"
},
"vmNumber": {
"metadata": {
"description": "Number of the VM in the pool"
},
"type": "int"
}
},
"resources": [],
"variables": {
"documentation1": "This sub-template intentionally blank - a blank template allows for an optional exectuion strategy",
"documentation2": "",
"documentation3": "You should look for a template of the same name, but with a 1 instead of a 0 (at the end)"
}
}

0
nested/recoveryservices1.json → nested/recoveryservices.json
Просмотреть файл

18
nested/recoveryservices0.json
Просмотреть файл

@ -1,18 +0,0 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
}
},
"resources": [],
"variables": {
"documentation1": "This sub-template intentionally blank - a blank template allows for an optional exectuion strategy",
"documentation2": "",
"documentation3": "You should look for a template of the same name, but with a 1 instead of a 0 (at the end)"
}
}

0
nested/recoveryservicesEnlist1.json → nested/recoveryservicesEnlist.json
Просмотреть файл

24
nested/recoveryservicesEnlist0.json
Просмотреть файл

@ -1,24 +0,0 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
},
"vmName": {
"metadata": {
"description": "Name of VM to enlist in AzureBackup"
},
"type": "string"
}
},
"resources": [],
"variables": {
"documentation1": "This sub-template intentionally blank - a blank template allows for an optional exectuion strategy",
"documentation2": "",
"documentation3": "You should look for a template of the same name, but with a 1 instead of a 0 (at the end)"
}
}

4
nested/webvmss.json
Просмотреть файл

@ -27,7 +27,7 @@
"location": "[resourceGroup().location]",
"name": "[parameters('moodleCommon').vmssName]",
"properties": {
"overprovision": "true",
"overprovision": true,
"upgradePolicy": {
"mode": "Manual"
},
@ -71,7 +71,7 @@
}
}
],
"primary": "true"
"primary": true
}
}
]

18
nested/webvmssconfig0.json
Просмотреть файл

@ -1,18 +0,0 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
}
},
"resources": [],
"variables": {
"documentation1": "This sub-template intentionally blank - a blank template allows for an optional exectuion strategy",
"documentation2": "",
"documentation3": "You should look for a template of the same name, but with a 1 instead of a 0 (at the end)"
}
}

40
nested/webvmssconfig1.json
Просмотреть файл

@ -1,40 +0,0 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"moodleCommon": {
"metadata": {
"description": "Common Moodle values"
},
"type": "object"
}
},
"resources": [
{
"apiVersion": "2015-06-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('moodleCommon').vmssName,'/','setup_moodle')]",
"properties": {
"autoUpgradeMinorVersion": true,
"publisher": "Microsoft.OSTCExtensions",
"settings": {
"commandToExecute": "[variables('cmdExec')]",
"fileUris": [
"[variables('scriptUri')]"
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4"
},
"tags": {
"displayName": "setup_moodle"
},
"type": "Microsoft.Compute/virtualMachines/extensions"
}
],
"variables": {
"cmdExec": "[concat('bash ',parameters('moodleCommon').moodleSetupScriptFilename,' ',parameters('moodleCommon').gfsNameRoot,'0', ' ','data', ' ', parameters('moodleCommon').siteURL, ' ', concat('jumpbox-vm-',parameters('moodleCommon').resourcesPrefix), ' ', parameters('moodleCommon').webServerType)]",
"scriptUri": "[concat(parameters('moodleCommon').ScriptLocation,parameters('moodleCommon').moodleSetupScriptFilename)]"
}
}