From 7db8bb982126f38418403edd5057f68ffa699b06 Mon Sep 17 00:00:00 2001 From: Nikcharlebois Date: Sun, 2 Aug 2015 09:02:01 -0400 Subject: [PATCH] Added the CentralAdministrationPort parameter to let users choose on what port to in off central administration --- .../MSFT_xSPCreateFarm.psm1 | 22 +++++++++++++------ .../MSFT_xSPCreateFarm.schema.mof | 3 ++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.psm1 b/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.psm1 index 8c9cfed9f..bcdea92f4 100644 --- a/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.psm1 +++ b/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.psm1 @@ -26,7 +26,10 @@ function Get-TargetResource [parameter(Mandatory = $true)] [System.String] - $AdminContentDatabaseName + $AdminContentDatabaseName, + + [System.UInt32] + $CentralAdministrationPort ) Write-Verbose -Message "Checking for local SP Farm" @@ -78,7 +81,10 @@ function Set-TargetResource [parameter(Mandatory = $true)] [System.String] - $AdminContentDatabaseName + $AdminContentDatabaseName, + + [System.UInt32] + $CentralAdministrationPort = 9999 ) $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount @@ -116,7 +122,7 @@ function Set-TargetResource Write-Verbose -Message "Creating Central Administration Website" Invoke-Command -Session $session -ScriptBlock { - New-SPCentralAdministration -Port 9999 -WindowsAuthProvider NTLM + New-SPCentralAdministration -Port $params.CentralAdministrationPort -WindowsAuthProvider NTLM } Write-Verbose -Message "Installing application content" @@ -154,15 +160,17 @@ function Test-TargetResource [parameter(Mandatory = $true)] [System.String] - $AdminContentDatabaseName + $AdminContentDatabaseName, + + [System.UInt32] + $CentralAdministrationPort = 9999 ) - $result = Get-TargetResource -FarmConfigDatabaseName $FarmConfigDatabaseName -DatabaseServer $DatabaseServer -FarmAccount $FarmAccount -InstallAccount $InstallAccount -Passphrase $Passphrase -AdminContentDatabaseName $AdminContentDatabaseName + $result = Get-TargetResource -FarmConfigDatabaseName $FarmConfigDatabaseName -DatabaseServer $DatabaseServer -FarmAccount $FarmAccount -InstallAccount $InstallAccount -Passphrase $Passphrase -AdminContentDatabaseName $AdminContentDatabaseName -CentralAdministrationPort $CentralAdministrationPort if ($result.Count -eq 0) { return $false } return $true } -Export-ModuleMember -Function *-TargetResource - +Export-ModuleMember -Function *-TargetResource \ No newline at end of file diff --git a/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.schema.mof b/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.schema.mof index 7ec48e43b..d51f8626e 100644 --- a/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.schema.mof +++ b/Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.schema.mof @@ -8,5 +8,6 @@ class MSFT_xSPCreateFarm : OMI_BaseResource [Required, EmbeddedInstance("MSFT_Credential")] String InstallAccount; [Required] String Passphrase; [Required] String AdminContentDatabaseName; + [Write] uint32 CentralAdministrationPort; }; - +S \ No newline at end of file