Skip to content
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
87 changes: 55 additions & 32 deletions armtemplates/latest/AzureBlobStorage-BoldReports.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
"description": "App name for Bold Reports Server. The name must be between 3 and 24 characters long, and can contain only numbers and lowercase letters."
}
},
"appServicePlanSize": {
"type": "string",
"allowedValues": [
"P1V3_2Core_8GB_DEV",
"P2V3_4Core_16GB_PROD",
"P3V3_8Core_32GB_PROD"
],
"defaultValue": "P1V3_2Core_8GB_DEV",
"metadata": {
"description": "The pricing tier size for the App Service Plan."
}
},
"storageAccountName": {
"type": "string",
"metadata": {
Expand All @@ -25,34 +37,45 @@
"description": "Type of the storage account created"
},
"defaultValue": "Standard_LRS"
}
}
},
"variables": {
"sizeMapping": {
"P1V3_2Core_8GB_DEV": "P1v3",
"P2V3_4Core_16GB_PROD": "P2v3",
"P3V3_8Core_32GB_PROD": "P3v3"
},
"WebAppSvcPlanWorkerSize": "0",
"WebAppSvcPlanSKU": "Basic",
"WebAppSvcPlanName": "SyncfusionAppSvcPlan"
"WebAppSvcPlanSKU": "PremiumV3",
"WebAppSvcPlanName": "BoldReportsAppSvcPlan",
"WebAppSvcPlanSize": "[variables('sizeMapping')[parameters('appServicePlanSize')]]",
"WebAppSvcPlanCapacity": 1
},
"resources": [
{
"name": "[variables('WebAppSvcPlanName')]",
"type": "Microsoft.Web/serverfarms",
"location": "[resourceGroup().location]",
"apiVersion": "2014-06-01",
"apiVersion": "2022-03-01",
"dependsOn": [],
"tags": {
"displayName": "AppSvcPlan"
},
"sku": {
"name": "[variables('WebAppSvcPlanSize')]",
"tier": "[variables('WebAppSvcPlanSKU')]",
"size": "[variables('WebAppSvcPlanSize')]",
"capacity": "[variables('WebAppSvcPlanCapacity')]"
},
"properties": {
"name": "[variables('WebAppSvcPlanName')]",
"sku": "[variables('WebAppSvcPlanSKU')]",
"workerSize": "[variables('WebAppSvcPlanWorkerSize')]"
"reserved": false
}
},
{
"name": "[parameters('WebAppName')]",
"type": "Microsoft.Web/sites",
"location": "[resourceGroup().location]",
"apiVersion": "2015-08-01",
"apiVersion": "2022-03-01",
"dependsOn": [
"[concat('Microsoft.Web/serverfarms/', variables('WebAppSvcPlanName'))]"
],
Expand All @@ -62,20 +85,20 @@
},
"properties": {
"name": "[parameters('WebAppName')]",
"siteConfig": {
"metadata": [
{
"name": "CURRENT_STACK",
"value": "dotnet"
}
]
"siteConfig": {
"metadata": [
{
"name": "CURRENT_STACK",
"value": "dotnet"
}
]
},
"clientAffinityEnabled": "false",
"clientAffinityEnabled": false,
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms/', variables('WebAppSvcPlanName'))]"
},
"resources": [
{
"apiVersion": "2015-08-01",
"apiVersion": "2022-03-01",
"name": "web",
"type": "config",
"dependsOn": [
Expand Down Expand Up @@ -115,24 +138,24 @@
"virtualPath": "/reporting/jobs",
"physicalPath": "site\\wwwroot\\reporting\\jobs"
},
{
{
"virtualPath": "/reporting/viewer",
"physicalPath": "site\\wwwroot\\reporting\\viewer"
},
{
"virtualPath": "/reporting/reportservice",
"physicalPath": "site\\wwwroot\\reporting\\reportservice"
},
{
{
"virtualPath": "/etlservice",
"physicalPath": "site\\wwwroot\\etl\\etlservice"
}
],
"http20Enabled": true
"http20Enabled": true
}
},
{
"apiVersion": "2015-08-01",
"apiVersion": "2022-03-01",
"name": "web",
"type": "sourcecontrols",
"dependsOn": [
Expand All @@ -147,7 +170,7 @@
{
"name": "appsettings",
"type": "config",
"apiVersion": "2015-08-01",
"apiVersion": "2022-03-01",
"dependsOn": [
"[concat('Microsoft.Web/sites/', parameters('WebAppName'))]",
"web",
Expand All @@ -158,18 +181,18 @@
},
"properties": {
"IdP:AzureBlobStorageAccountName": "[toLower(parameters('storageAccountName'))]",
"IdP:AzureBlobServiceEndpoint": "[concat('https://',toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]",
"IdP:AzureBlobServiceEndpoint": "[concat('https://', toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]",
"IdP:AzureBlobStorageAccessKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', toLower(parameters('storageAccountName'))), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value]",
"IdP:AzureBlobContainerName": "boldreportscontainer",
"IdP:AzureBlobConnectionType": "https",
"IdP:AzureBlobStorageUri": "[concat('https://',toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]",
"IdP:AzureBlobStorageUri": "[concat('https://', toLower(parameters('storageAccountName')), '.blob.core.windows.net/')]",
"IdP:StorageType": "AzureBlob",
"StorageType": "AzureBlob",
"IsAzureApplication": "true",
"log4net.Config": "logs\\log4net.config",
"WEBSITE_DYNAMIC_CACHE": "0",
"WEBSITE_LOAD_USER_PROFILE":"1",
"ApplicationUrl":"[concat('https://',parameters('WebAppName'), '.azurewebsites.net')]"
"WEBSITE_LOAD_USER_PROFILE": "1",
"ApplicationUrl": "[concat('https://', parameters('WebAppName'), '.azurewebsites.net')]"
}
}
]
Expand All @@ -178,14 +201,14 @@
"name": "[toLower(parameters('storageAccountName'))]",
"type": "Microsoft.Storage/storageAccounts",
"location": "[resourceGroup().location]",
"apiVersion": "2015-06-15",
"dependsOn": [],
"apiVersion": "2022-05-01",
"tags": {
"displayName": "storageaccount"
},
"properties": {
"accountType": "[parameters('storageAccountType')]"
}
"sku": {
"name": "[parameters('storageAccountType')]"
},
"properties": {}
}
]
}
}
16 changes: 14 additions & 2 deletions armtemplates/latest/BoldReportsAppServiceTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@
"description": "App name for Bold Reports Server. The name must be between 3 and 24 characters long, and can contain only numbers and lowercase letters."
}
},
"appServicePlanSize": {
"type": "string",
"allowedValues": [
"P1V3_2Core_8GB_DEV",
"P2V3_4Core_16GB_PROD",
"P3V3_8Core_32GB_PROD"
],
"defaultValue": "P1v3: 2core-8gb_RAM",
"metadata": {
"description": "The pricing tier size for the App Service Plan."
}
},
"storageAccountName": {
"type": "string",
"maxLength": 24,
Expand All @@ -33,7 +45,7 @@
}
},
"variables": {
"templatelink": "https://raw.githubusercontent.com/boldreports/bold-reports-azure/master/armtemplates/v10.1.11/AzureBlobStorage-BoldReports.json"
"templatelink": "https://raw.githubusercontent.com/boldreports/bold-reports-azure/KC1209/armtemplates/latest/AzureBlobStorage-BoldReports.json"
},
"resources": [
{
Expand All @@ -54,4 +66,4 @@
}
}
]
}
}