Skip to content

Commit 896927b

Browse files
Merge branch 'main' into pvrk-sharepointps-apr
2 parents 4c9f02e + 17cb888 commit 896927b

File tree

3 files changed

+94
-0
lines changed

3 files changed

+94
-0
lines changed

.github/workflows/AutoPublish.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: (Scheduled) Publish to live
2+
3+
permissions:
4+
contents: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "25 5,11,17,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
10+
11+
workflow_dispatch:
12+
13+
jobs:
14+
15+
auto-publish:
16+
if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
18+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
EnableAutoPublish: true
21+
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
25+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

sharepoint/sharepoint-server-ps/sharepoint-server/Connect-SPConfigurationDatabase.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Connects the local server computer to a farm.
2121
Connect-SPConfigurationDatabase [-DatabaseName] <String> [-SkipRegisterAsDistributedCacheHost]
2222
[-Passphrase] <SecureString> -DatabaseServer <String> [-AssignmentCollection <SPAssignmentCollection>]
2323
[-DatabaseCredentials <PSCredential>] [-DatabaseFailOverPartner <String>] [-LocalServerRole <SPServerRole>]
24+
[-DatabaseConnectionEncryption <SqlConnectionEncryptOption>] [-DatabaseServerCertificateHostName <String>]
2425
[<CommonParameters>]
2526
```
2627

@@ -192,6 +193,39 @@ Accept pipeline input: False
192193
Accept wildcard characters: False
193194
```
194195
196+
### -DatabaseConnectionEncryption
197+
Specifies whether TLS encryption is used for the connection between SharePoint and the database.
198+
Mandatory requires that TLS encryption is used. If TLS encryption can't be successfully negotiated, the connection will fail.
199+
Optional allows TLS encryption to be used. If the database server requires TLS encryption, then TLS encryption will be used. Otherwise, TLS encryption will not be used.
200+
Strict requires that TLS encryption is used with TDS 8.0, which is the strongest encryption configuration. If TLS encryption with TDS 8.0 can't be successfully negotiated, the connection will fail.
201+
Databases mounted to SharePoint before the Version 24H2 feature update was installed default to Optional encryption. If this parameter is not specified when mounting a new database to SharePoint after the Version 24H2 feature update is installed, the default is Mandatory.
202+
203+
```yaml
204+
Type: SqlConnectionEncryptOption
205+
Parameter Sets: (All)
206+
Aliases:
207+
Applicable: SharePoint Server Subscription Edition
208+
Required: True
209+
Position: Named
210+
Default value: Mandatory
211+
Accept pipeline input: True
212+
Accept wildcard characters: False
213+
```
214+
### -DatabaseServerCertificateHostName
215+
Sets the host name to use when validating the server certificate for the connection.
216+
217+
```yaml
218+
Type: String
219+
Parameter Sets: (All)
220+
Aliases:
221+
Applicable: SharePoint Server Subscription Edition
222+
Required: False
223+
Position: Named
224+
Default value: None
225+
Accept pipeline input: True
226+
Accept wildcard characters: False
227+
```
228+
195229
### CommonParameters
196230
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (https://go.microsoft.com/fwlink/?LinkID=113216).
197231

sharepoint/sharepoint-server-ps/sharepoint-server/New-SPConfigurationDatabase.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ New-SPConfigurationDatabase [-DatabaseName] <String> [-DatabaseServer] <String>
2323
[[-DatabaseCredentials] <PSCredential>] [-FarmCredentials] <PSCredential> [-Passphrase] <SecureString>
2424
[-SkipRegisterAsDistributedCacheHost] [-AssignmentCollection <SPAssignmentCollection>]
2525
[-DatabaseFailOverServer <String>] [-LocalServerRole <SPServerRole>] [-ServerRoleOptional]
26+
[-DatabaseConnectionEncryption <SqlConnectionEncryptOption>] [-DatabaseServerCertificateHostName <String>]
2627
[<CommonParameters>]
2728
```
2829

@@ -317,6 +318,40 @@ Accept pipeline input: False
317318
Accept wildcard characters: False
318319
```
319320

321+
### -DatabaseConnectionEncryption
322+
Specifies whether TLS encryption is used for the connection between SharePoint and the database.
323+
Mandatory requires that TLS encryption is used. If TLS encryption can't be successfully negotiated, the connection will fail.
324+
Optional allows TLS encryption to be used. If the database server requires TLS encryption, then TLS encryption will be used. Otherwise, TLS encryption will not be used.
325+
Strict requires that TLS encryption is used with TDS 8.0, which is the strongest encryption configuration. If TLS encryption with TDS 8.0 can't be successfully negotiated, the connection will fail.
326+
Databases mounted to SharePoint before the Version 24H2 feature update was installed default to Optional encryption. If this parameter is not specified when mounting a new database to SharePoint after the Version 24H2 feature update is installed, the default is Mandatory.
327+
328+
```yaml
329+
Type: SqlConnectionEncryptOption
330+
Parameter Sets: (All)
331+
Aliases:
332+
Applicable: SharePoint Server Subscription Edition
333+
Required: False
334+
Position: Named
335+
Default value: Mandatory
336+
Accept pipeline input: True
337+
Accept wildcard characters: False
338+
```
339+
340+
### -DatabaseServerCertificateHostName
341+
Sets the host name to use when validating the server certificate for the connection.
342+
343+
```yaml
344+
Type: String
345+
Parameter Sets: (All)
346+
Aliases:
347+
Applicable: SharePoint Server Subscription Edition
348+
Required: False
349+
Position: Named
350+
Default value: None
351+
Accept pipeline input: True
352+
Accept wildcard characters: False
353+
```
354+
320355
### CommonParameters
321356
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (https://go.microsoft.com/fwlink/?LinkID=113216).
322357

0 commit comments

Comments
 (0)