fix-template

Yvand · Nov 19, 2024 · d99c7ff · d99c7ff
1 parent d9bee98
commit d99c7ff
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 23 deletions.
diff --git a/Azure Resource Manager/SharePoint-ADFS/CHANGELOG.md b/Azure Resource Manager/SharePoint-ADFS/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Change log for Azure template SharePoint-ADFS
 
-## Unreleased
+## Enhancements & bug-fixes - Unreleased
+
+### Changed
+
+- Template
+  - Value `Subscription-Latest` for parameter `sharePointVersion` now installs the November 2024 CU for SharePoint Subscription
+
+### Fixed
+
+- Template
+  - Stopped using the Windows Server's [small disk](https://azure.microsoft.com/en-us/blog/new-smaller-windows-server-iaas-image/) image for SharePoint Subscription VMs, as SharePoint updates no longer have enough free disk space to be installed.
+
+## Enhancements & bug-fixes - Published in September 17, 2024
 
 ### Added
 

diff --git a/Azure Resource Manager/SharePoint-ADFS/Deploy-AzureResourceGroup.ps1 b/Azure Resource Manager/SharePoint-ADFS/Deploy-AzureResourceGroup.ps1
@@ -3,7 +3,7 @@
 
 ### Set variables
 $resourceGroupLocation = 'francecentral'
-$resourceGroupName = "xxydsp2"
+$resourceGroupName = "xxydsp1"
 # $resourceGroupName = "gf(d)df_-sf.sm"
 $templateFileName = 'main.bicep'
 $templateParametersFileName = 'azuredeploy.parameters.json'

diff --git a/Azure Resource Manager/SharePoint-ADFS/README.md b/Azure Resource Manager/SharePoint-ADFS/README.md
@@ -74,7 +74,7 @@ IMPORTANT: If you set variable `outboundAccessMethod` to `AzureFirewallProxy`, y
 ### Input parameters
 
 - parameter `sharePointVersion` lets you choose which version of SharePoint to install:
-  - `Subscription-Latest` (default): Same as `Subscription-RTM`, then installs the latest cumulative update available at the time of publishing this version: September 2024 ([kb5002640](https://support.microsoft.com/help/5002640)).
+  - `Subscription-Latest` (default): Same as `Subscription-RTM`, then installs the latest cumulative update available at the time of publishing this version: November 2024 ([KB5002651](https://support.microsoft.com/help/5002651)).
   - `Subscription-24H2`: Same as `Subscription-RTM`, then installs the [Feature Update 24H2](https://learn.microsoft.com/en-us/sharepoint/what-s-new/new-and-improved-features-in-sharepoint-server-subscription-edition-24h2-release) (September 2024 CU / [kb5002640](https://support.microsoft.com/help/5002640)).
   - `Subscription-24H1`: Same as `Subscription-RTM`, then installs the [Feature Update 24H1](https://learn.microsoft.com/en-us/sharepoint/what-s-new/new-and-improved-features-in-sharepoint-server-subscription-edition-24h1-release) (March 2024 CU / [KB5002564](https://support.microsoft.com/help/5002564)).
   - `Subscription-23H2`: Same as `Subscription-RTM`, then installs the [Feature Update 23H2](https://learn.microsoft.com/en-us/SharePoint/what-s-new/new-and-improved-features-in-sharepoint-server-subscription-edition-23h2-release) (September 2023 CU / [KB5002474](https://support.microsoft.com/help/5002474)).
@@ -104,6 +104,8 @@ You can visit <https://azure.com/e/ec984bb923214cd1b8ee36d7ffc54e8e> to estimate
 ## Known issues
 
 - The password for the User Profile directory synchronization connection (value of parameter `otherAccountsPassword`) needs to be re-entered in the "Edit synchronization connection" page, otherwise the import fails (password decryption error).
+- When parameter `outboundAccessMethod` is `AzureFirewallProxy`, most of the softwares installed through Chocolatey failed to download and are not installed.
+- When deploying SharePoint 2016 or 2019, the trial enterprise licence has already expired, so you must enter your own in the central administration, then run iisreset and restart the SPTimerV4 service on all the servers.
 
 ## More information
 

diff --git a/Azure Resource Manager/SharePoint-ADFS/azuredeploy.json b/Azure Resource Manager/SharePoint-ADFS/azuredeploy.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "15949922842727340567"
+      "version": "0.31.92.45157",
+      "templateHash": "16379190582606587936"
     },
     "description": "Create a DC, a SQL Server 2022, and from 1 to 5 server(s) hosting a SharePoint Subscription / 2019 / 2016 farm with an extensive configuration, including trusted authentication, user profiles with personal sites, an OAuth trust (using a certificate), a dedicated IIS site for hosting high-trust add-ins, etc... The latest version of key softwares (including Fiddler, vscode, np++, 7zip, ULS Viewer) is installed. SharePoint machines have additional fine-tuning to make them immediately usable (remote administration tools, custom policies for Edge and Chrome, shortcuts, etc...).",
     "author": "Yvand"
@@ -84,7 +84,7 @@
       "defaultValue": "No",
       "minLength": 1,
       "metadata": {
-        "description": "Specify if a rule in the network security groups should allow the inbound RDP traffic:\r\n- \"No\" (default): No rule is created, RDP traffic is blocked.\r\n- \"*\" or \"Internet\": RDP traffic is allowed from everywhere.\r\n- CIDR notation (e.g. 192.168.99.0/24 or 2001:1234::/64) or an IP address (e.g. 192.168.99.0 or 2001:1234::): RDP traffic is allowed from the IP address / pattern specified.\r\n"
+        "description": "Specify if a rule in the network security groups should allow the inbound RDP traffic:\n- \"No\" (default): No rule is created, RDP traffic is blocked.\n- \"*\" or \"Internet\": RDP traffic is allowed from everywhere.\n- CIDR notation (e.g. 192.168.99.0/24 or 2001:1234::/64) or an IP address (e.g. 192.168.99.0 or 2001:1234::): RDP traffic is allowed from the IP address / pattern specified.\n"
       }
     },
     "outboundAccessMethod": {
@@ -95,7 +95,7 @@
         "AzureFirewallProxy"
       ],
       "metadata": {
-        "description": "Select how the virtual machines connect to internet.\r\nIMPORTANT: With AzureFirewallProxy, you need to either enable Azure Bastion, or manually add a public IP address to a virtual machine, to be able to connect to it.\r\n"
+        "description": "Select how the virtual machines connect to internet.\nIMPORTANT: With AzureFirewallProxy, you need to either enable Azure Bastion, or manually add a public IP address to a virtual machine, to be able to connect to it.\n"
       }
     },
     "enableAzureBastion": {
@@ -359,7 +359,7 @@
     "sharePointSettings": {
       "isSharePointSubscription": "[if(startsWith(parameters('sharePointVersion'), 'subscription'), true(), false())]",
       "sharePointImagesList": {
-        "Subscription": "MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition-smalldisk:latest",
+        "Subscription": "MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition:latest",
         "sp2019": "MicrosoftSharePoint:MicrosoftSharePointServer:sp2019gen2smalldisk:latest",
         "sp2016": "MicrosoftSharePoint:MicrosoftSharePointServer:sp2016:latest"
       },
@@ -425,7 +425,7 @@
           "Label": "Latest",
           "Packages": [
             {
-              "DownloadUrl": "https://download.microsoft.com/download/6/6/a/66a0057f-79af-4307-8263-103ee75ef5c6/uber-subscription-kb5002640-fullfile-x64-glb.exe"
+              "DownloadUrl": "https://download.microsoft.com/download/4/b/4/4b4d907f-2e25-4972-a7b1-dfe8d1c0fadb/uber-subscription-kb5002651-fullfile-x64-glb.exe"
             }
           ]
         }
@@ -703,7 +703,7 @@
           },
           {
             "name": "proxyHttpsPort",
-            "value": "[variables('firewall_proxy_settings').https_port]"
+            "value": "[string(variables('firewall_proxy_settings').https_port)]"
           },
           {
             "name": "localDomainFqdn",
@@ -900,7 +900,7 @@
           },
           {
             "name": "proxyHttpsPort",
-            "value": "[variables('firewall_proxy_settings').https_port]"
+            "value": "[string(variables('firewall_proxy_settings').https_port)]"
           },
           {
             "name": "localDomainFqdn",
@@ -1096,7 +1096,7 @@
           },
           {
             "name": "proxyHttpsPort",
-            "value": "[variables('firewall_proxy_settings').https_port]"
+            "value": "[string(variables('firewall_proxy_settings').https_port)]"
           },
           {
             "name": "localDomainFqdn",
@@ -1237,7 +1237,7 @@
       "name": "[format('vm-fe{0}-pip', range(0, parameters('frontEndServersCount'))[copyIndex()])]",
       "location": "[parameters('location')]",
       "sku": {
-        "name": "Basic",
+        "name": "Standard",
         "tier": "Regional"
       },
       "properties": {
@@ -1361,7 +1361,7 @@
           },
           {
             "name": "proxyHttpsPort",
-            "value": "[variables('firewall_proxy_settings').https_port]"
+            "value": "[string(variables('firewall_proxy_settings').https_port)]"
           },
           {
             "name": "localDomainFqdn",

diff --git a/Azure Resource Manager/SharePoint-ADFS/azuredeploy.parameters.json b/Azure Resource Manager/SharePoint-ADFS/azuredeploy.parameters.json
@@ -2,10 +2,10 @@
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "sharePointVersion": { "value": "Subscription-24H2" },
+    "sharePointVersion": { "value": "Subscription-Latest" },
     // "sharePointVersion": { "value": "2019" },
-    "domainFqdn": { "value": "xcontoso.local" },
-    "adminUsername": { "value": "xyvand" },
+    "domainFqdn": { "value": "contoso.local" },
+    "adminUsername": { "value": "yvand" },
     "timeZone": { "value": "Romance Standard Time" },
     "vmSharePointStorage": { "value": "Premium_LRS" },
     // "outboundAccessMethod": { "value": "PublicIPAddress" },
@@ -14,25 +14,25 @@
     "frontEndServersCount": { "value": 1 },
     "enableHybridBenefitServerLicenses": { "value": true },
     "enableAzureBastion": { "value": true },
-    "_artifactsLocation": { "value": "https://github.com/Yvand/AzureRM-Templates/raw/dev/Templates/SharePoint-ADFS/" },
+    "_artifactsLocation": { "value": "https://github.com/Yvand/AzureRM-Templates/raw/convert-to-bicep/Azure%20Resource@20Manager/SharePoint-ADFS/" },
     "_artifactsLocationSasToken": { "value": "" },
     "autoShutdownTime": {
       "value": "1900"
     },
     "vmDcSize": {
-      "value": "Standard_B2s"
+      "value": "Standard_B2als_v2"
     },
     "vmDcStorage": {
       "value": "StandardSSD_LRS"
     },
     "vmSqlSize": {
-      "value": "Standard_B2ms"
+      "value": "Standard_B2as_v2"
     },
     "vmSqlStorage": {
       "value": "StandardSSD_LRS"
     },
     "vmSharePointSize": {
-      "value": "Standard_B4ms"
+      "value": "Standard_B4as_v2"
     }
   }
 }
diff --git a/Azure Resource Manager/SharePoint-ADFS/main.bicep b/Azure Resource Manager/SharePoint-ADFS/main.bicep
@@ -282,7 +282,7 @@ var resourceGroupNameFormatted = replace(
 var sharePointSettings = {
   isSharePointSubscription: (startsWith(sharePointVersion, 'subscription') ? true : false)
   sharePointImagesList: {
-    Subscription: 'MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition-smalldisk:latest'
+    Subscription: 'MicrosoftWindowsServer:WindowsServer:2022-datacenter-azure-edition:latest'
     sp2019: 'MicrosoftSharePoint:MicrosoftSharePointServer:sp2019gen2smalldisk:latest'
     sp2016: 'MicrosoftSharePoint:MicrosoftSharePointServer:sp2016:latest'
   }
@@ -348,7 +348,7 @@ var sharePointSettings = {
       Label: 'Latest'
       Packages: [
         {
-          DownloadUrl: 'https://download.microsoft.com/download/6/6/a/66a0057f-79af-4307-8263-103ee75ef5c6/uber-subscription-kb5002640-fullfile-x64-glb.exe'
+          DownloadUrl: 'https://download.microsoft.com/download/4/b/4/4b4d907f-2e25-4972-a7b1-dfe8d1c0fadb/uber-subscription-kb5002651-fullfile-x64-glb.exe'
         }
       ]
     }