Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #47

Merged
merged 5 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/app-service-plan.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"reserved": "[contains(parameters('kind'), 'linux')]",
"tags": "[union(parameters('tags'), variables('timeStampTag'))]",
"apiVersionAsp": "2022-03-01"
"apiVersionAsp": "2022-09-01"
},
"resources": [
{
Expand Down
14 changes: 9 additions & 5 deletions template/app-service.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"defaultValue": "app",
"allowedValues": [
"app",
"app,linux,container",
"functionapp",
"functionapp,linux",
"app,linux,container"
"functionapp,linux"
]
},
"assignSystemIdentity": {
Expand Down Expand Up @@ -95,10 +95,9 @@
"defaultValue": "",
"allowedValues": [
"",
"V3.1",
"V5.0",
"V6.0",
"V7.0"
"V7.0",
"V8.0"
]
},
"nodeVersion": {
Expand All @@ -121,6 +120,10 @@
"description": "az webapp list-runtimes --os-type linux"
}
},
"vnetImagePullEnabled": {
"type": "bool",
"defaultValue": false
},
"publicNetworkAccess": {
"type": "string",
"defaultValue": "Disabled",
Expand Down Expand Up @@ -363,6 +366,7 @@
"scmMinTlsVersion": "[parameters('scmMinTlsVersion')]",
"use32BitWorkerProcess": "[parameters('use32BitWorkerProcess')]",
"vnetRouteAllEnabled": "[parameters('routeAllTrafficThroughVNet')]",
"vnetImagePullEnabled": "[parameters('vnetImagePullEnabled')]",
"webSocketsEnabled": "[parameters('webSocketsEnabled')]",
"copy": [
{
Expand Down
313 changes: 313 additions & 0 deletions template/db.mysql.flex-server.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,313 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"timestamp": {
"type": "string",
"defaultValue": "[utcNow('u')]"
},
"location": {
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
"description": "Azure region"
}
},
"serverName": {
"type": "string",
"metadata": {
"description": "The name of the Azure Database for MySQL server to create."
}
},
"userAssignedIdentityId": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "The resource id of the user assigned identity to be used for the Azure Database for MySQL server."
}
},
"administratorLogin": {
"type": "string",
"metadata": {
"description": "The username for the administrator account of the Azure Database for MySQL server."
}
},
"administratorLoginPassword": {
"type": "securestring",
"metadata": {
"description": "The password for the administrator account of the Azure Database for MySQL server."
}
},
"skuName": {
"type": "string",
"defaultValue": "Standard_B1ms",
"metadata": {
"description": "The name of the sku, e.g. Standard_D32ds_v4."
}
},
"skuTier": {
"type": "string",
"defaultValue": "Burstable",
"metadata": {
"description": "Azure database for MySql tier",
"allowedValues": [
"Burstable",
"GeneralPurpose",
"MemoryOptimized"
]
}
},
"version": {
"type": "string",
"defaultValue": "8.0.21",
"allowedValues": [
"5.7",
"8.0.21"
],
"metadata": {
"description": "Server version"
}
},
"availabilityZone": {
"type": "string",
"defaultValue": "1",
"metadata": {
"description": "Availability Zone information of the server. (Leave blank for No Preference)."
}
},
"createMode": {
"type": "string",
"defaultValue": "Default",
"allowedValues": [
"Default",
"GeoRestore",
"Replica",
"PointInTimeRestore"
]
},
"haEnabled": {
"type": "string",
"defaultValue": "Disabled",
"allowedValues": [
"Disabled",
"SameZone",
"ZoneRedundant"
],
"metadata": {
"description": "High availability mode for a server : Disabled, SameZone, or ZoneRedundant"
}
},
"standbyAvailabilityZone": {
"type": "string",
"defaultValue": "2",
"metadata": {
"description": "Availability zone of the standby server."
}
},
"storageSizeGB": {
"type": "int",
"defaultValue": 20
},
"storageIops": {
"type": "int",
"defaultValue": 360
},
"storageAutogrow": {
"type": "string",
"defaultValue": "Enabled",
"allowedValues": [
"Enabled",
"Disabled"
]
},
"autoIoScaling": {
"type": "string",
"defaultValue": "Enabled",
"allowedValues": [
"Enabled",
"Disabled"
]
},
"logOnDisk": {
"type": "string",
"defaultValue": "Disabled",
"allowedValues": [
"Enabled",
"Disabled"
]
},
"replicationRole": {
"type": "string",
"defaultValue": "None",
"allowedValues": [
"None"
"Replica"
"Source"
]
},
"backupRetentionDays": {
"type": "string",
"defaultValue": ""
},
"restorePointInTime": {
"type": "string",
"defaultValue": ""
},
"sourceServerResourceId": {
"type": "int",
"defaultValue": 7
},
"geoRedundantBackup": {
"type": "string",
"defaultValue": "Disabled",
"allowedValues": [
"Disabled",
"Enabled"
]
},
"dataEncryptionGeoBackupKeyUri": {
"type": "string",
"defaultValue": ""
},
"dataEncryptionGeoBackupUserAssignedIdentityId": {
"type": "string",
"defaultValue": ""
},
"dataEncryptionPrimaryKeyUri": {
"type": "string",
"defaultValue": ""
},
"dataEncryptionPrimaryUserAssignedIdentityId": {
"type": "string",
"defaultValue": ""
},
"dataEncryptionType": {
"type": "string",
"defaultValue": "SystemManaged",
"allowedValues": [
"AzureKeyVault",
"SystemManaged"
]
},
"maintenanceCustomWindow": {
"type": "string",
"defaultValue": "Disabled",
"allowedValues": [
"Enabled",
"Disabled"
]
},
"maintenanceDayOfWeek": {
"type": "int",
"defaultValue": 6
},
"maintenanceStartHour": {
"type": "int",
"defaultValue": 23
},
"maintenanceStartMinute": {
"type": "int",
"defaultValue": 0
},
"delegatedSubnetResourceId": {
"type": "string",
"defaultValue": ""
},
"privateDnsZoneResourceId": {
"type": "string",
"defaultValue": ""
},
"publicNetworkAccess": {
"type": "string",
"defaultValue": "Disabled",
"allowedValues": [
"Enabled",
"Disabled"
]
},
"tags": {
"type": "object",
"defaultValue": "[createObject()]"
}
},
"variables": {
"timeStampTag": {
"Timestamp": "[parameters('timestamp')]"
},
"tags": "[union(parameters('tags'), variables('timeStampTag'))]",
"identity": "[
if
(
not(empty(parameters('userAssignedIdentityId'))),
createObject
(
'type', 'UserAssigned',
'userAssignedIdentities',
createObject
(
parameters('userAssignedIdentityId'), createObject()
)
),
json('null')
)
]",
"apiVersionMySql": "2022-09-30-preview"
},
"resources": [
{
"type": "Microsoft.DBforMySQL/flexibleServers",
"apiVersion": "[variables('apiVersionMySql')]",
"name": "[parameters('serverName')]",
"location": "[parameters('location')]",
"tags": "[variables('tags')]",
"sku": {
"name": "[parameters('skuName')]",
"tier": "[parameters('skuTier')]"
},
"identity": "[variables('identity')]",
"properties": {
"administratorLogin": "[parameters('administratorLogin')]",
"administratorLoginPassword": "[parameters('administratorLoginPassword')]",
"version": "[parameters('version')]",
"createMode": "[parameters('createMode')]",
"availabilityZone": "[parameters('availabilityZone')]",
"highAvailability": {
"mode": "[parameters('haEnabled')]",
"standbyAvailabilityZone": "[parameters('standbyAvailabilityZone')]"
},
"storage": {
"storageSizeGB": "[parameters('storageSizeGB')]",
"iops": "[parameters('storageIops')]",
"autoIoScaling": "[parameters('autoIoScaling')]",
"autoGrow": "[parameters('storageAutogrow')]",
"logOnDisk": "[parameters('logOnDisk')]"
},
"dataEncryption": {
"geoBackupKeyURI": "[parameters('dataEncryptionGeoBackupKeyUri')]",
"geoBackupUserAssignedIdentityId": "[parameters('dataEncryptionGeoBackupUserAssignedIdentityId')]",
"primaryKeyURI": "[parameters('dataEncryptionPrimaryKeyUri')]",
"primaryUserAssignedIdentityId": "[parameters('dataEncryptionPrimaryUserAssignedIdentityId')]",
"type": "[parameters('dataEncryptionType')]"
},
"maintenanceWindow": {
"customWindow": "[parameters('maintenanceCustomWindow')]",
"dayOfWeek": "[parameters('maintenanceDayOfWeek')]",
"startHour": "[parameters('maintenanceStartHour')]",
"startMinute": "[parameters('maintenanceStartMinute')]"
},
"network": {
"delegatedSubnetResourceId": "[parameters('delegatedSubnetResourceId')]",
"privateDnsZoneResourceId": "[parameters('privateDnsZoneResourceId')]",
"publicNetworkAccess": "[parameters('publicNetworkAccess')]"
},
"replicationRole": "[parameters('replicationRole')]",
"restorePointInTime": "[parameters('restorePointInTime')]",
"sourceServerResourceId": "[parameters('sourceServerResourceId')]",
"backup": {
"backupRetentionDays": "[parameters('backupRetentionDays')]",
"geoRedundantBackup": "[parameters('geoRedundantBackup')]"
}
}
}
]
}