Merge pull request #34 from NikCharlebois/1.9.1.0

PR October 12
microsoft · Oct 12, 2017 · b9f2e33 · b9f2e33
2 parents 13b1a0c + 55fb139
commit b9f2e33
Showing 1 changed file with 29 additions and 11 deletions.
diff --git a/SharePointDSC.Reverse.ps1 b/SharePointDSC.Reverse.ps1
@@ -18,7 +18,9 @@
 
 * Fixed '@' in Account names;
 * Fixed secondary servers issues;
-* ServerRole for SharePoint 2016 is now in ConfigurationData;
+* ServerRole for SharePoint 2016 is now in Configuration Data;
+* Fix for SPSite Owners and Secondary Owners credentials;
+* Fix for Distributed Cache service instance in Configuration Data;
 #>
 
 #Requires -Modules @{ModuleName="ReverseDSC";ModuleVersion="1.9.1.0"},@{ModuleName="SharePointDSC";ModuleVersion="1.9.0.0"}
@@ -434,6 +436,15 @@ function Orchestrator
               $Script:dscConfigContent += "            {`r`n"
               $Script:dscConfigContent += "                Name = `$ServiceInstance.Name;`r`n"
               $Script:dscConfigContent += "                Ensure = `$ServiceInstance.Ensure;`r`n"
+
+              if($PSVersionTable.PSVersion.Major -ge 5)
+              {
+                  $Script:dscConfigContent += "                PsDscRunAsCredential = `$Creds" + ($Global:spFarmAccount.Username.Split('\'))[1].Replace("-","_").Replace(".", "_").Replace("@","").Replace(" ","") + "`r`n"
+              }
+              else {
+                  $Script:dscConfigContent += "                InstallAccount = `$Creds" + ($Global:spFarmAccount.Username.Split('\'))[1].Replace("-","_").Replace(".", "_").Replace("@","").Replace(" ","") + "`r`n"
+              }
+
               $Script:dscConfigContent += "            }`r`n"
               $Script:dscConfigContent += "        }`r`n"
           }
@@ -1082,30 +1093,33 @@ function Read-SPSitesAndWebs (){
           $results = Repair-Credentials -results $results
 
           $ownerAlias = Get-Credentials -UserName $results.OwnerAlias
+          $currentBlock = ""
           if($null -ne $ownerAlias)
           {            
               $results.OwnerAlias = (Resolve-Credentials -UserName $results.OwnerAlias) + ".UserName"
-              $currentBlock = Get-DSCBlock -UseGetTargetResource -Params $results -ModulePath $module
-              $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "OwnerAlias"
-          }
-          else
-          {
-              $currentBlock = Get-DSCBlock -UseGetTargetResource -Params $results -ModulePath $module
+
           }
+
           if($results.ContainsKey("SecondaryOwnerAlias"))
           {
               $secondaryOwner = Get-Credentials -UserName $results.SecondaryOwnerAlias
               if($null -ne $secondaryOwner)
               {            
                   $results.SecondaryOwnerAlias = (Resolve-Credentials -UserName $results.SecondaryOwnerAlias) + ".UserName"
-                  $currentBlock = Get-DSCBlock -UseGetTargetResource -Params $results -ModulePath $module
-                  $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "SecondaryOwnerAlias"
               }
               else {
                   Add-ReverseDSCUserName -UserName $results.SecondaryOwnerAlias
               }
           }
-
+          $currentBlock = Get-DSCBlock -UseGetTargetResource -Params $results -ModulePath $module
+          if($null -ne $results.SecondaryOwnerAlias -and $results.SecondaryOwnerAlias.StartsWith("`$"))
+          {
+            $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "SecondaryOwnerAlias"
+          }
+          if($null -ne $results.OwnerAlias -and $results.OwnerAlias.StartsWith("`$"))
+          {
+            $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "OwnerAlias"
+          }
           $Script:dscConfigContent += $currentBlock
           $Script:dscConfigContent += "            DependsOn =  " + $dependsOnClause + "`r`n"
           $Script:dscConfigContent += "        }`r`n"
@@ -1330,7 +1344,11 @@ function Read-SPServiceInstance($Servers)
               $ensureValue = "Absent"
           }
           $currentService = @{Name = $serviceInstance.TypeName; Ensure = $ensureValue}
-          $serviceStatuses += $currentService
+
+          if($serviceInstance.TypeName -ne "Distributed Cache" -and $serviceInstance.TypeName -ne "User Profile Synchronization Service")
+          {
+            $serviceStatuses += $currentService
+          }
           if($ensureValue -eq "Present" -and !$servicesMasterList.Contains($serviceInstance.TypeName))
           {              
               $servicesMasterList += $serviceInstance.TypeName