Merge branch 'master' into internal

scepman · Jan 13, 2025 · 206483d · 206483d
2 parents c4f1888 + 148530c
commit 206483d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/azuredeploy.bicep b/azuredeploy.bicep
@@ -91,7 +91,7 @@ module CreateVirtualNetwork 'nestedtemplates/vnet.bicep' = if (deployPrivateNetw
 
 @batchSize(1)
 module AppService_ConnectionToVirtualNetwork 'nestedtemplates/vnet-to-appservices.bicep' = [
-  for i in range(0, 2): {
+  for i in range(0, 2): if (deployPrivateNetwork) {
     name: 'AppService-${i}-ConnectionToVirtualNetwork'
     params: {
       virtualNetworkName: virtualNetworkName

diff --git a/nestedtemplates/appConfig-scepman.bicep b/nestedtemplates/appConfig-scepman.bicep
@@ -52,6 +52,7 @@ resource appServiceName_appsettings 'Microsoft.Web/sites/config@2024-04-01' = {
     '${convertVariableNameToLinux('AppConfig:ValidityPeriodDays', deployOnLinux)}': '730'
     '${convertVariableNameToLinux('AppConfig:IntuneValidation:ValidityPeriodDays', deployOnLinux)}': '365'
     '${convertVariableNameToLinux('AppConfig:DirectCSRValidation:Enabled', deployOnLinux)}': 'true'
+    '${convertVariableNameToLinux('AppConfig:DbCSRValidation:ReenrollmentAllowedCertificateTypes', deployOnLinux)}': 'Static'
     '${convertVariableNameToLinux('AppConfig:IntuneValidation:DeviceDirectory', deployOnLinux)}': 'AADAndIntune'
     '${convertVariableNameToLinux('AppConfig:CRL:Source', deployOnLinux)}': 'Storage'
     '${convertVariableNameToLinux('AppConfig:EnableCertificateStorage', deployOnLinux)}': 'true'