Merge pull request #62 from NikCharlebois/master

added CentraladministrationPort parameter to MSFTt_xSPCreateFarm
dsccommunity · Aug 3, 2015 · f9181b6 · f9181b6
2 parents e6388da + 7db8bb9
commit f9181b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git 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
diff --git 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