Skip to content

Commit 3b4c94f

Browse files
ykuijsykuijs
authored
Fix SharePoint role installation script (AutomatedLab#1279)
* Corrected SharePoint installation script * Corrected SharePoint installation script * Corrected Changelog * Correcting rebase issues * One last update
1 parent 4008c8a commit 3b4c94f

File tree

6 files changed

+156
-132
lines changed

6 files changed

+156
-132
lines changed

‎AutomatedLab/AutomatedLab.init.ps1

+43-43
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ else
5757
}
5858

5959
$usedRelease = (Split-Path -Leaf -Path $PSScriptRoot) -as [version]
60-
$currentRelease = try {((Invoke-RestMethod -Method Get -Uri https://api.github.com/repos/AutomatedLab/AutomatedLab/releases/latest -ErrorAction Stop).tag_Name -replace 'v') -as [Version] } catch {}
60+
$currentRelease = try { ((Invoke-RestMethod -Method Get -Uri https://api.github.com/repos/AutomatedLab/AutomatedLab/releases/latest -ErrorAction Stop).tag_Name -replace 'v') -as [Version] } catch {}
6161

6262
if ($currentRelease -and $usedRelease -lt $currentRelease)
6363
{
@@ -300,15 +300,15 @@ Set-PSFConfig -Module AutomatedLab -Name SharePoint2016Prerequisites -Value @(
300300
) -Initialize -Description 'List of prerequisite urls for SP2013' -Validation stringarray
301301

302302
Set-PSFConfig -Module AutomatedLab -Name SharePoint2019Prerequisites -Value @(
303-
"https://download.microsoft.com/download/B/E/D/BED73AAC-3C8A-43F5-AF4F-EB4FEA6C8F3A/ENU/x64/sqlncli.msi",
304-
"https://download.microsoft.com/download/3/C/F/3CF781F5-7D29-4035-9265-C34FF2369FA2/setup_msipc_x64.exe",
305-
"https://download.microsoft.com/download/B/9/D/B9D6E014-C949-4A1E-BA6B-2E0DEBA23E54/SyncSetup_en.x64.zip",
306-
"https://download.microsoft.com/download/1/C/A/1CAA41C7-88B9-42D6-9E11-3C655656DAB1/WcfDataServices.exe",
307-
"https://download.microsoft.com/download/0/1/D/01D06854-CA0C-46F1-ADBA-EBF86010DCC6/rtm/MicrosoftIdentityExtensions-64.msi",
308-
"https://download.microsoft.com/download/A/6/7/A678AB47-496B-4907-B3D4-0A2D280A13C0/WindowsServerAppFabricSetup_x64.exe",
309-
"https://download.microsoft.com/download/F/1/0/F1093AF6-E797-4CA8-A9F6-FC50024B385C/AppFabric-KB3092423-x64-ENU.exe",
310-
'https://download.microsoft.com/download/5/7/2/57249A3A-19D6-4901-ACCE-80924ABEB267/ENU/x64/msodbcsql.msi'
311-
'https://download.microsoft.com/download/6/E/4/6E48E8AB-DC00-419E-9704-06DD46E5F81D/NDP472-KB4054530-x86-x64-AllOS-ENU.exe'
303+
'https://download.microsoft.com/download/F/3/C/F3C64941-22A0-47E9-BC9B-1A19B4CA3E88/ENU/x64/sqlncli.msi',
304+
'https://download.microsoft.com/download/3/C/F/3CF781F5-7D29-4035-9265-C34FF2369FA2/setup_msipc_x64.exe',
305+
'https://download.microsoft.com/download/E/0/0/E0060D8F-2354-4871-9596-DC78538799CC/Synchronization.msi',
306+
'https://download.microsoft.com/download/1/C/A/1CAA41C7-88B9-42D6-9E11-3C655656DAB1/WcfDataServices.exe',
307+
'https://download.microsoft.com/download/0/1/D/01D06854-CA0C-46F1-ADBA-EBF86010DCC6/rtm/MicrosoftIdentityExtensions-64.msi',
308+
'https://download.microsoft.com/download/A/6/7/A678AB47-496B-4907-B3D4-0A2D280A13C0/WindowsServerAppFabricSetup_x64.exe',
309+
'https://download.microsoft.com/download/F/1/0/F1093AF6-E797-4CA8-A9F6-FC50024B385C/AppFabric-KB3092423-x64-ENU.exe',
310+
'https://download.microsoft.com/download/5/7/2/57249A3A-19D6-4901-ACCE-80924ABEB267/ENU/x64/msodbcsql.msi',
311+
'https://download.visualstudio.microsoft.com/download/pr/1f5af042-d0e4-4002-9c59-9ba66bcf15f6/089f837de42708daacaae7c04b7494db/ndp472-kb4054530-x86-x64-allos-enu.exe'
312312
) -Initialize -Description 'List of prerequisite urls for SP2013' -Validation stringarray
313313

314314
# Dynamics 365 CRM
@@ -336,13 +336,13 @@ Set-PSFConfig -Module AutomatedLab -Name ConfigurationManagerUrl2103TP -Value "h
336336
# Validation
337337
Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
338338
ValidRoleProperties = @{
339-
Orchestrator2012 = @(
339+
Orchestrator2012 = @(
340340
'DatabaseServer'
341341
'DatabaseName'
342342
'ServiceAccount'
343343
'ServiceAccountPassword'
344344
)
345-
DC = @(
345+
DC = @(
346346
'IsReadOnly'
347347
'SiteName'
348348
'SiteSubnet'
@@ -351,7 +351,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
351351
'SysvolPath'
352352
'DsrmPassword'
353353
)
354-
CaSubordinate = @(
354+
CaSubordinate = @(
355355
'ParentCA'
356356
'ParentCALogicalName'
357357
'CACommonName'
@@ -392,14 +392,14 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
392392
'OCSPHTTPURL02'
393393
'DoNotLoadDefaultTemplates'
394394
)
395-
Office2016 = 'SharedComputerLicensing'
396-
DSCPullServer = @(
395+
Office2016 = 'SharedComputerLicensing'
396+
DSCPullServer = @(
397397
'DoNotPushLocalModules'
398398
'DatabaseEngine'
399399
'SqlServer'
400400
'DatabaseName'
401401
)
402-
FirstChildDC = @(
402+
FirstChildDC = @(
403403
'ParentDomain'
404404
'NewDomain'
405405
'DomainFunctionalLevel'
@@ -411,12 +411,12 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
411411
'SysvolPath'
412412
'DsrmPassword'
413413
)
414-
ADFS = @(
414+
ADFS = @(
415415
'DisplayName'
416416
'ServiceName'
417417
'ServicePassword'
418418
)
419-
RootDC = @(
419+
RootDC = @(
420420
'DomainFunctionalLevel'
421421
'ForestFunctionalLevel'
422422
'SiteName'
@@ -427,7 +427,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
427427
'SysvolPath'
428428
'DsrmPassword'
429429
)
430-
CaRoot = @(
430+
CaRoot = @(
431431
'CACommonName'
432432
'CAType'
433433
'KeyLength'
@@ -466,20 +466,20 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
466466
'OCSPHTTPURL02'
467467
'DoNotLoadDefaultTemplates'
468468
)
469-
Tfs2015 = @('Port','InitialCollection', 'DbServer')
470-
Tfs2017 = @('Port','InitialCollection', 'DbServer')
471-
Tfs2018 = @('Port','InitialCollection', 'DbServer')
472-
AzDevOps = @('Port','InitialCollection', 'DbServer','PAT','Organisation')
473-
TfsBuildWorker = @(
469+
Tfs2015 = @('Port', 'InitialCollection', 'DbServer')
470+
Tfs2017 = @('Port', 'InitialCollection', 'DbServer')
471+
Tfs2018 = @('Port', 'InitialCollection', 'DbServer')
472+
AzDevOps = @('Port', 'InitialCollection', 'DbServer', 'PAT', 'Organisation')
473+
TfsBuildWorker = @(
474474
'NumberOfBuildWorkers'
475475
'TfsServer'
476476
'AgentPool'
477477
'PAT'
478478
'Organisation'
479479
'Capabilities'
480480
)
481-
WindowsAdminCenter = @('Port', 'EnableDevMode', 'ConnectedNode', 'UseSsl')
482-
Scvmm2016 = @(
481+
WindowsAdminCenter = @('Port', 'EnableDevMode', 'ConnectedNode', 'UseSsl')
482+
Scvmm2016 = @(
483483
'MUOptIn'
484484
'SqlMachineName'
485485
'LibraryShareDescription'
@@ -507,7 +507,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
507507
'ConnectHyperVRoleVms'
508508
'ConnectClusters'
509509
)
510-
Scvmm2019 = @(
510+
Scvmm2019 = @(
511511
'MUOptIn'
512512
'SqlMachineName'
513513
'LibraryShareDescription'
@@ -535,7 +535,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
535535
'ConnectHyperVRoleVms'
536536
'ConnectClusters'
537537
)
538-
DynamicsFull = @(
538+
DynamicsFull = @(
539539
'SqlServer',
540540
'ReportingUrl',
541541
'OrganizationCollation',
@@ -564,7 +564,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
564564
'PrivReportingGroup'
565565
'LicenseKey'
566566
)
567-
DynamicsFrontend = @(
567+
DynamicsFrontend = @(
568568
'SqlServer',
569569
'ReportingUrl',
570570
'OrganizationCollation',
@@ -593,7 +593,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
593593
'PrivReportingGroup'
594594
'LicenseKey'
595595
)
596-
DynamicsBackend = @(
596+
DynamicsBackend = @(
597597
'SqlServer',
598598
'ReportingUrl',
599599
'OrganizationCollation',
@@ -622,7 +622,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
622622
'PrivReportingGroup'
623623
'LicenseKey'
624624
)
625-
DynamicsAdmin = @(
625+
DynamicsAdmin = @(
626626
'SqlServer',
627627
'ReportingUrl',
628628
'OrganizationCollation',
@@ -651,7 +651,7 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
651651
'PrivReportingGroup'
652652
'LicenseKey'
653653
)
654-
ScomManagement = @(
654+
ScomManagement = @(
655655
'ManagementGroupName'
656656
'SqlServerInstance'
657657
'SqlInstancePort'
@@ -674,25 +674,25 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
674674
'AcceptEndUserLicenseAgreement'
675675
'ProductKey'
676676
)
677-
678-
ScomConsole = @(
677+
678+
ScomConsole = @(
679679
'EnableErrorReporting'
680680
'InstallLocation'
681681
'SendCEIPReports'
682682
'UseMicrosoftUpdate'
683683
'AcceptEndUserLicenseAgreement'
684684
)
685-
686-
ScomWebConsole = @(
685+
686+
ScomWebConsole = @(
687687
'ManagementServer'
688688
'WebSiteName'
689689
'WebConsoleAuthorizationMode'
690690
'SendCEIPReports'
691691
'UseMicrosoftUpdate'
692692
'AcceptEndUserLicenseAgreement'
693693
)
694-
695-
ScomReporting = @(
694+
695+
ScomReporting = @(
696696
'ManagementServer'
697697
'SRSInstance'
698698
'DataReaderUser'
@@ -709,17 +709,17 @@ Set-PSFConfig -Module AutomatedLab -Name ValidationSettings -Value @{
709709
'GrantAdministrativePrivilege'
710710
'PooledUnmanaged'
711711
)
712-
RemoteDesktopGateway = @(
712+
RemoteDesktopGateway = @(
713713
'GatewayExternalFqdn'
714714
'BypassLocal'
715715
'LogonMethod'
716716
'UseCachedCredentials'
717717
'GatewayMode'
718718
)
719-
RemoteDesktopLicensing = @(
719+
RemoteDesktopLicensing = @(
720720
'Mode'
721721
)
722-
ConfigurationManager = @(
722+
ConfigurationManager = @(
723723
'Version'
724724
'Branch'
725725
'Roles'
@@ -810,11 +810,11 @@ Register-PSFTeppScriptblock -Name 'AutomatedLab-TimeZone' -ScriptBlock {
810810
}
811811

812812
Register-PSFTeppScriptblock -Name 'AutomatedLab-RhelPackage' -ScriptBlock {
813-
(Get-LabAvailableOperatingSystem -UseOnlyCache -ErrorAction SilentlyContinue | Where-Object {$_.OperatingSystemType -eq 'Linux' -and $_.LinuxType -eq 'RedHat'} | Sort-Object Version | Select-Object -Last 1).LinuxPackageGroup
813+
(Get-LabAvailableOperatingSystem -UseOnlyCache -ErrorAction SilentlyContinue | Where-Object { $_.OperatingSystemType -eq 'Linux' -and $_.LinuxType -eq 'RedHat' } | Sort-Object Version | Select-Object -Last 1).LinuxPackageGroup
814814
}
815815

816816
Register-PSFTeppScriptblock -Name 'AutomatedLab-SusePackage' -ScriptBlock {
817-
(Get-LabAvailableOperatingSystem -UseOnlyCache -ErrorAction SilentlyContinue | Where-Object {$_.OperatingSystemType -eq 'Linux' -and $_.LinuxType -eq 'SuSE'} | Sort-Object Version | Select-Object -Last 1).LinuxPackageGroup
817+
(Get-LabAvailableOperatingSystem -UseOnlyCache -ErrorAction SilentlyContinue | Where-Object { $_.OperatingSystemType -eq 'Linux' -and $_.LinuxType -eq 'SuSE' } | Sort-Object Version | Select-Object -Last 1).LinuxPackageGroup
818818
}
819819

820820
Register-PSFTeppArgumentCompleter -Command Add-LabMachineDefinition -Parameter Roles -Name 'AutomatedLab-Roles'

0 commit comments

Comments
 (0)