|
210 | 210 | "metadata": { |
211 | 211 | "description": "Set to false to skip subnet creation (useful when subnets already exist)" |
212 | 212 | } |
213 | | - }, |
214 | | - "vnetAddressPrefix": { |
215 | | - "type": "string", |
216 | | - "defaultValue": "10.0.0.0/16", |
217 | | - "metadata": { |
218 | | - "description": "Address space for the VNet (e.g., 10.0.0.0/16)" |
219 | | - } |
220 | | - }, |
221 | | - "subnetAddressForApp": { |
222 | | - "type": "string", |
223 | | - "defaultValue": "10.0.0.0/24", |
224 | | - "metadata": { |
225 | | - "description": "Address prefix for the App Service subnet (e.g., 10.0.0.0/24)" |
226 | | - } |
227 | | - }, |
228 | | - "subnetAddressForDb": { |
229 | | - "type": "string", |
230 | | - "defaultValue": "10.0.1.0/24", |
231 | | - "metadata": { |
232 | | - "description": "Address prefix for the Database subnet (e.g., 10.0.1.0/24)" |
233 | | - } |
234 | | - }, |
235 | | - "useExistingPrivateDnsZone": { |
236 | | - "type": "bool", |
237 | | - "defaultValue": false, |
238 | | - "metadata": { |
239 | | - "description": "Set to true to use an existing Private DNS Zone instead of creating a new one" |
240 | | - } |
241 | 213 | } |
242 | 214 | }, |
243 | 215 | "resources": [ |
|
427 | 399 | "dependsOn": [ |
428 | 400 | "[resourceId('Microsoft.Network/privateDnsZones/virtualNetworkLinks', parameters('privateDnsZoneNameForDb'), format('{0}-vnetlink', parameters('privateDnsZoneNameForDb')))]", |
429 | 401 | "[concat('Microsoft.ManagedIdentity/userAssignedIdentities/', parameters('managedIdentityName'))]", |
430 | | - "[if(parameters('createSubnets'), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), if(parameters('useExistingVnet'), resourceId('Microsoft.Resources/deployments', 'update_existing_subnets'), resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))))]" |
| 402 | + "[if(parameters('createSubnets'), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), if(parameters('useExistingVnet'), resourceId('Microsoft.Resources/deployments', 'add_delegations'), resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))))]" |
431 | 403 | ], |
432 | 404 | "identity": { |
433 | 405 | "type": "UserAssigned", |
|
555 | 527 | "properties": { |
556 | 528 | "addressSpace": { |
557 | 529 | "addressPrefixes": [ |
558 | | - "[parameters('vnetAddressPrefix')]" |
| 530 | + "[variables('vnetAddress')]" |
559 | 531 | ] |
560 | 532 | }, |
561 | 533 | "subnets": [] |
|
569 | 541 | "condition": "[parameters('createSubnets')]", |
570 | 542 | "dependsOn": [ |
571 | 543 | ], |
572 | | - "resourceGroup": "[parameters('serverFarmResourceGroup')]", |
573 | | - "subscriptionId": "[subscription().subscriptionId]", |
574 | 544 | "properties": { |
575 | 545 | "mode": "Incremental", |
576 | 546 | "template": { |
|
584 | 554 | "apiVersion": "2021-03-01", |
585 | 555 | "name": "[format('{0}/{1}', parameters('vnetName'), parameters('subnetForApp'))]", |
586 | 556 | "properties": { |
587 | | - "addressPrefix": "[parameters('subnetAddressForApp')]", |
| 557 | + "addressPrefix": "[variables('subnetAddressForApp')]", |
588 | 558 | "delegations": [ |
589 | 559 | { |
590 | 560 | "name": "dlg-appService", |
|
600 | 570 | "apiVersion": "2021-03-01", |
601 | 571 | "name": "[format('{0}/{1}',parameters('vnetName'), parameters('subnetForDb'))]", |
602 | 572 | "properties": { |
603 | | - "addressPrefix": "[parameters('subnetAddressForDb')]", |
| 573 | + "addressPrefix": "[variables('subnetAddressForDb')]", |
604 | 574 | "delegations": [ |
605 | 575 | { |
606 | 576 | "name": "dlg-appService", |
|
620 | 590 | }, |
621 | 591 | { |
622 | 592 | "type": "Microsoft.Resources/deployments", |
623 | | - "name": "update_existing_subnets", |
| 593 | + "name": "add_delegations", |
624 | 594 | "apiVersion": "[variables('resourceDeploymentApiVersion')]", |
625 | 595 | "condition": "[and(parameters('useExistingVnet'), not(parameters('createSubnets')))]", |
626 | 596 | "dependsOn": [ |
627 | 597 | ], |
628 | | - "resourceGroup": "[parameters('serverFarmResourceGroup')]", |
629 | | - "subscriptionId": "[subscription().subscriptionId]", |
630 | 598 | "properties": { |
631 | 599 | "mode": "Incremental", |
632 | 600 | "template": { |
|
640 | 608 | "apiVersion": "2021-03-01", |
641 | 609 | "name": "[format('{0}/{1}', parameters('vnetName'), parameters('subnetForApp'))]", |
642 | 610 | "properties": { |
643 | | - "addressPrefix": "[parameters('subnetAddressForApp')]", |
| 611 | + "addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForApp')), '2021-03-01').addressPrefix]", |
644 | 612 | "delegations": [ |
645 | 613 | { |
646 | 614 | "name": "dlg-appService", |
|
656 | 624 | "apiVersion": "2021-03-01", |
657 | 625 | "name": "[format('{0}/{1}',parameters('vnetName'), parameters('subnetForDb'))]", |
658 | 626 | "properties": { |
659 | | - "addressPrefix": "[parameters('subnetAddressForDb')]", |
| 627 | + "addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForDb')), '2021-03-01').addressPrefix]", |
660 | 628 | "delegations": [ |
661 | 629 | { |
662 | 630 | "name": "dlg-mysql", |
|
701 | 669 | ], |
702 | 670 | "dependsOn": [ |
703 | 671 | "[resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))]", |
704 | | - "[if(parameters('createSubnets'), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), if(parameters('useExistingVnet'), resourceId('Microsoft.Resources/deployments', 'update_existing_subnets'), resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))))]" |
| 672 | + "[if(parameters('createSubnets'), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), if(parameters('useExistingVnet'), resourceId('Microsoft.Resources/deployments', 'add_delegations'), resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))))]" |
705 | 673 | ] |
706 | 674 | }, |
707 | 675 | { |
|
1163 | 1131 | "databaseVersion": "8.0.21", |
1164 | 1132 | "vnetDeploymentApiVersion": "2020-07-01", |
1165 | 1133 | "privateDnsApiVersion": "2018-09-01", |
| 1134 | + "vnetAddress": "10.0.0.0/23", |
| 1135 | + "subnetAddressForApp": "10.0.0.0/24", |
| 1136 | + "subnetAddressForDb": "10.0.1.0/24", |
1166 | 1137 | "blobApiVersion": "2021-08-01", |
1167 | 1138 | "storageAccountId": "[resourceId(parameters('storageAccountResourceGroup'),'Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]", |
1168 | 1139 | "emailApiVersion": "2023-03-31", |
|
0 commit comments