Skip to content

Commit

Permalink
Added support for SXP 10.1.1 (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
sc-stenstorgaard authored Jun 10, 2021
1 parent 339ecc6 commit c342023
Show file tree
Hide file tree
Showing 53 changed files with 17,422 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Choose the compatible templates for your Sitecore version:
| Sitecore 9.3.0 | Sitecore 9.3 |
| Sitecore 10.0.0 | Sitecore 10.0.0 and Sitecore 10.0.1 |
| Sitecore 10.1.0 | Sitecore 10.1.0 |
| Sitecore 10.1.1 | Sitecore 10.1.1 |
| WFFM 8.2.3 | Web Forms For Marketers 8.2 Update-3, Update-4 and Update-5 |
| WFFM 9.0.0 | Web Forms For Marketers 9.0 |
| AD 1.3.0 | Active Directory 1.3 |
Expand Down
61 changes: 61 additions & 0 deletions Sitecore 10.1.1/XM/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Sitecore XM Environment

Visualize:
[Infrastructure](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FSitecore%2Fsitecore-azure-quickstart-templates%2Fmaster%2FSitecore%209.0.0%2Fxm%2Fnested%2Finfrastructure.json),
[Application deployment](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FSitecore%2Fsitecore-azure-quickstart-templates%2Fmaster%2FSitecore%209.0.0%2Fxm%2Fnested%2Fapplication.json)


This template creates a Sitecore XM Environment with all resources necessary to run Sitecore.

Resources provisioned:

* Azure SQL databases : core, master, web, forms
* Azure Redis Cache for session state
* Sitecore roles: Content Delivery, Content Management
* Hosting plans: one per role
* Preconfigured Web Applications, based on the provided WebDeploy packages
* Azure Search Service
* (optional) Application Insights for diagnostics and monitoring


## Parameters
The **deploymentId** and **licenseXml** parameters are to be filled in by the PowerShell script.

| Parameter | Description
|-------------------------|------------------------------------------------
| sqlServerLogin | The name of the administrator account for the newly created Azure SQL server.
| sqlServerPassword | The password for the administrator account for Azure SQL server.
| sitecoreAdminPassword | The new password for the Sitecore **admin** account.
| siMsDeployPackageUrl | The HTTP(s) URL to a Sitecore Identity Server Web Deploy package.
| cmMsDeployPackageUrl | The HTTP(s) URL to a Sitecore XM Content Management Web Deploy package.
| cdMsDeployPackageUrl | The HTTP(s) URL to a Sitecore XM Content Delivery Web Deploy package.
| authCertificateBlob | A Base64-encoded blob of the authentication certificate in PKCS #12 format.
| authCertificatePassword | A password to the authentication certificate.

> **Note:**
> * The **searchServiceLocation** parameter can be added to the `azuredeploy.parameters.json`
> to specify geographical region to deploy Azure Search Service. Default value is the resource
> group location.
> * The **applicationInsightsLocation** parameter can be added to the`azuredeploy.parameters.json`
> to specify geographical region to deploy Application Insights. Default value is **East US**.
> * The **useApplicationInsights** parameter can be added to the`azuredeploy.parameters.json`
> to control whether Application Insights will be used for diagnostics and monitoring. Default value is **true**.
## Deploying with Solr Search

> Sitecore Solr PaaS deployment requires the following parameter to be specified in `azuredeploy.parameters.json`:
| Parameter | Description
--------------------------------------------|------------------------------------------------
| solrConnectionString | Connection string to existing Solr server.

> **solrConnectionString** parameter is used to identify whether Solr search provider is to be used for the deployment or not.
> The default value is empty which means that Azure Search will be used.
## Deploying with App Service Environment v2
> **Note**: Application Service Environment is not provisioned as part of this deployment template. Please reffer to official [documentation](https://docs.microsoft.com/en-us/azure/app-service/environment/intro) for information about ASE deployment and configuration.
| Parameter | Description
--------------------------------------------|------------------------------------------------
| aseName | Name of deployed App Service Environment
| aseResourceGroupName | Resource group where App Service Environment is deployed. Provide this value if ASE is hosted in different resouce group
80 changes: 80 additions & 0 deletions Sitecore 10.1.1/XM/addons/bootloader.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"variables": {
"webApiVersion": "2018-02-01",
"cmWebAppNameTidy": "[toLower(trim(parameters('cmWebAppName')))]",
"cdWebAppNameTidy": "[toLower(trim(parameters('cdWebAppName')))]"
},
"parameters": {
"standard": {
"type": "secureObject",
"defaultValue": {
"deploymentId": null,
"location": null,
"cmWebAppName": null,
"cdWebAppName": null
}
},
"extension": {
"type": "secureObject",
"defaultValue": {
"msDeployPackageUrl": "$default"
}
},
"deploymentId": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').deploymentId, resourceGroup().name)]"
},
"location": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').location, resourceGroup().location)]"
},
"cmWebAppName": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').cmWebAppName, concat(parameters('deploymentId'), '-cm'))]"
},
"cdWebAppName": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').cdWebAppName, concat(parameters('deploymentId'), '-cd'))]"
},
"msDeployPackageUrl": {
"type": "securestring",
"defaultValue": "[parameters('extension').msDeployPackageUrl]"
}
},
"resources": [
{
"name": "[concat(variables('cmWebAppNameTidy'), '/', 'MSDeploy')]",
"type": "Microsoft.Web/sites/extensions",
"location": "[parameters('location')]",
"apiVersion": "[variables('webApiVersion')]",
"properties": {
"addOnPackages": [
{
"packageUri": "[parameters('msDeployPackageUrl')]",
"setParameters": {
"Application Path": "[variables('cmWebAppNameTidy')]"
}
}
]
}
},
{
"name": "[concat(variables('cdWebAppNameTidy'), '/', 'MSDeploy')]",
"type": "Microsoft.Web/sites/extensions",
"location": "[parameters('location')]",
"apiVersion": "[variables('webApiVersion')]",
"properties": {
"addOnPackages": [
{
"packageUri": "[parameters('msDeployPackageUrl')]",
"setParameters": {
"Application Path": "[variables('cdWebAppNameTidy')]"
}
}
]
}
}
]
}
137 changes: 137 additions & 0 deletions Sitecore 10.1.1/XM/addons/generic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"variables": {
"webApiVersion": "2018-02-01",

"sqlServerFqdnTidy": "[trim(toLower(parameters('sqlServerFqdn')))]",

"coreSqlDatabaseNameTidy": "[trim(toLower(parameters('coreSqlDatabaseName')))]",
"masterSqlDatabaseNameTidy": "[trim(toLower(parameters('masterSqlDatabaseName')))]",

"cmWebAppNameTidy": "[trim(toLower(parameters('cmWebAppName')))]",
"cdWebAppNameTidy": "[trim(toLower(parameters('cdWebAppName')))]"
},
"parameters": {
"standard": {
"type": "secureObject",
"defaultValue": {
"infrastructure": { "sqlServerFqdn":null },
"deploymentId": null,
"location": null,
"sqlServerLogin": null,
"sqlServerPassword": null,
"coreSqlDatabaseName": null,
"masterSqlDatabaseName": null,
"cmWebAppName": null,
"cdWebAppName": null
}
},
"extension": {
"type": "secureObject",
"defaultValue": {
"cmMsDeployPackageUrl": null,
"cdMsDeployPackageUrl": null
}
},
"infrastructure": {
"type": "secureObject",
"defaultValue": "[parameters('standard').infrastructure]"
},

"deploymentId": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').deploymentId, resourceGroup().name)]"
},
"location": {
"type": "string",
"minLength": 1,
"defaultValue": "[coalesce(parameters('standard').location, resourceGroup().location)]"
},

"sqlServerFqdn": {
"type": "string",
"minLength": 1,
"defaultValue": "[parameters('infrastructure').sqlServerFqdn]"
},
"sqlServerLogin": {
"type": "string",
"minLength": 1,
"defaultValue": "[parameters('standard').sqlServerLogin]"
},
"sqlServerPassword": {
"type": "securestring",
"minLength": 8,
"defaultValue": "[parameters('standard').sqlServerPassword]"
},

"coreSqlDatabaseName": {
"type": "string",
"minLength": 1,
"defaultValue": "[coalesce(parameters('standard').coreSqlDatabaseName, concat(parameters('deploymentId'), '-core-db'))]"
},
"masterSqlDatabaseName": {
"type": "string",
"minLength": 1,
"defaultValue": "[coalesce(parameters('standard').masterSqlDatabaseName, concat(parameters('deploymentId'), '-master-db'))]"
},

"cmWebAppName": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').cmWebAppName, concat(parameters('deploymentId'), '-cm'))]"
},
"cdWebAppName": {
"type": "string",
"defaultValue": "[coalesce(parameters('standard').cdWebAppName, concat(parameters('deploymentId'), '-cd'))]"
},

"cmMsDeployPackageUrl": {
"type": "securestring",
"defaultValue": "[parameters('extension').cmMsDeployPackageUrl]"
},
"cdMsDeployPackageUrl": {
"type": "securestring",
"defaultValue": "[parameters('extension').cdMsDeployPackageUrl]"
}
},
"resources": [
{
"name": "[concat(variables('cmWebAppNameTidy'), '/', 'MSDeploy')]",
"type": "Microsoft.Web/sites/extensions",
"location": "[parameters('location')]",
"apiVersion": "[variables('webApiVersion')]",
"properties": {
"addOnPackages": [
{
"dbType": "SQL",
"connectionString": "[concat('Data Source=tcp:', variables('sqlServerFqdnTidy'), ',1433;Initial Catalog=master;User Id=', parameters('sqlServerLogin'), ';Password=', parameters('sqlServerPassword'), ';')]",
"packageUri": "[parameters('cmMsDeployPackageUrl')]",
"setParameters": {
"Application Path": "[variables('cmWebAppNameTidy')]",
"Core Admin Connection String": "[concat('Encrypt=True;TrustServerCertificate=False;Data Source=', variables('sqlServerFqdnTidy'), ',1433;Initial Catalog=',variables('coreSqlDatabaseNameTidy'),';User Id=', parameters('sqlServerLogin'), ';Password=', parameters('sqlServerPassword'), ';')]",
"Master Admin Connection String": "[concat('Encrypt=True;TrustServerCertificate=False;Data Source=', variables('sqlServerFqdnTidy'), ',1433;Initial Catalog=',variables('masterSqlDatabaseNameTidy'),';User Id=', parameters('sqlServerLogin'), ';Password=', parameters('sqlServerPassword'), ';')]"
}
}
]
}
},
{
"name": "[concat(variables('cdWebAppNameTidy'), '/', 'MSDeploy')]",
"type": "Microsoft.Web/sites/extensions",
"location": "[parameters('location')]",
"apiVersion": "[variables('webApiVersion')]",
"properties": {
"addOnPackages": [
{
"dbType": "SQL",
"connectionString": "[concat('Data Source=tcp:', variables('sqlServerFqdnTidy'), ',1433;Initial Catalog=master;User Id=', parameters('sqlServerLogin'), ';Password=', parameters('sqlServerPassword'), ';')]",
"packageUri": "[parameters('cdMsDeployPackageUrl')]",
"setParameters": {
"Application Path": "[variables('cdWebAppNameTidy')]"
}
}
]
}
}
]
}
Loading

0 comments on commit c342023

Please sign in to comment.