Skip to content

Commit

Permalink
Merge branch 'yvand/add-oidc' of https://github.com/Yvand/SharePointDsc
Browse files Browse the repository at this point in the history
… into yvand/add-oidc
  • Loading branch information
Yvand committed Jan 14, 2022
2 parents 47b2d9f + 2d69d02 commit b7896c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- SPTrustedIdentityTokenIssuer
- Added parameters to support OIDC authentication in SharePoint Server Subscription Edition
- SPFarm
- Suppress a useless reboot that was triggered once a server joined the farm
- Suppress a useless 5 minutes sleep triggered once a server joined the farm

## [5.0.0] - 2021-12-17

Expand Down
9 changes: 1 addition & 8 deletions SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -1235,14 +1235,7 @@ function Set-TargetResource
{
Write-Verbose -Message "Starting timer service"
Start-Service -Name sptimerv4

Write-Verbose -Message ("Pausing for 5 minutes to allow the timer service to " +
"fully provision the server")
Start-Sleep -Seconds 300
Write-Verbose -Message ("Join farm complete. Restarting computer to allow " +
"configuration to continue")

$global:DSCMachineStatus = 1
Write-Verbose -Message ("Join farm complete")
}
}
}
Expand Down

0 comments on commit b7896c1

Please sign in to comment.