Skip to content

Commit 9c54e74

Browse files
authored
Merge branch 'main' into messagingconfiguration
2 parents 8d6f224 + 2c85df7 commit 9c54e74

File tree

4 files changed

+93
-10
lines changed

4 files changed

+93
-10
lines changed

exchange/exchange-ps/exchange/Get-IPv6StatusForAcceptedDomain.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ If IPv6 is enabled for an accepted domain in Exchange Online, IPv4 and IPv6 addr
3434

3535
You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://learn.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
3636

37+
> [!NOTE]
38+
> When you use the Enable-IPv6ForAcceptedDomain or Disable-IPv6ForAcceptedDomain cmdlets to update the IPv6 setting for an accepted domain, the updated status can take up to an hour to be visible using Get-IPv6StatusForAcceptedDomain due to caching.
39+
>
40+
> For example, Get-IPv6StatusForAcceptedDomain shows the status value Enabled for a domain. You run Disable-IPv6ForAcceptedDomain to disable IPv6 for the domain, you immediately run Get-IPv6StatusForAcceptedDomain to check the staus of the domain, and the command erroneously returns the value Enabled. It might take up to an hour before Get-IPv6StatusForAcceptedDomain shows the correct value Disabled for the domain.
41+
3742
## EXAMPLES
3843

3944
### Example 1
@@ -96,10 +101,7 @@ Accept wildcard characters: False
96101
### CommonParameters
97102
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/p/?LinkID=113216).
98103
99-
## INPUTS
100104
101-
## OUTPUTS
102105
103-
## NOTES
104106
105-
## RELATED LINKS
107+

exchange/exchange-ps/exchange/Set-ComplianceSecurityFilter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $filterusers = Get-ComplianceSecurityFilter -FilterName "Ottawa Users Filter"
4343
4444
$filterusers.users.add("pilarp@contoso.com")
4545
46-
Set-ComplianceSecurityFilter -FilterName OttawaUsersFilter -Users $filterusers.users
46+
Set-ComplianceSecurityFilter -FilterName "Ottawa Users Filter" -Users $filterusers.users
4747
```
4848

4949
This example adds user pilarp@contoso.com to the compliance security filter named Ottawa Users Filter without affecting other users assigned to the filter.
@@ -54,7 +54,7 @@ $filterusers = Get-ComplianceSecurityFilter -FilterName "Ottawa Users Filter"
5454
5555
$filterusers.users.remove("annb@contoso.com")
5656
57-
Set-ComplianceSecurityFilter -FilterName OttawaUsersFilter -Users $filterusers.users
57+
Set-ComplianceSecurityFilter -FilterName "Ottawa Users Filter" -Users $filterusers.users
5858
```
5959

6060
This example removes user annb@contoso.com to the compliance security filter named Ottawa Users Filter without affecting other users assigned to the filter.

teams/teams-ps/teams/Set-CsExternalAccessPolicy.md

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This cmdlet was introduced in Lync Server 2010.
1919

2020
### Identity (Default)
2121
```
22-
Set-CsExternalAccessPolicy [-Tenant <Guid>] [-Description <String>] [-EnableFederationAccess <Boolean>] [-EnableAcsFederationAccess <Boolean>]
22+
Set-CsExternalAccessPolicy [-Tenant <Guid>] [-Description <String>] [-EnableFederationAccess <Boolean>] [-CommunicationWithExternalOrgs <Boolean>] [-AllowedExternalDomains <List>] [-BlockedExternalDomains <List>] [-EnableAcsFederationAccess <Boolean>]
2323
[-EnableXmppAccess <Boolean>] [-EnablePublicCloudAccess <Boolean>]
2424
[-EnablePublicCloudAudioVideoAccess <Boolean>] [-EnableTeamsConsumerAccess <Boolean>] [-EnableTeamsConsumerInbound <Boolean>] [-EnableOutsideAccess <Boolean>] [[-Identity] <XdsIdentity>]
2525
[-RestrictTeamsConsumerAccessToExternalUserProfiles <Boolean>] [-EnableTeamsSmsAccess <Boolean>]
@@ -28,7 +28,7 @@ Set-CsExternalAccessPolicy [-Tenant <Guid>] [-Description <String>] [-EnableFede
2828

2929
### Instance
3030
```
31-
Set-CsExternalAccessPolicy [-Tenant <Guid>] [-Description <String>] [-EnableFederationAccess <Boolean>] [-EnableAcsFederationAccess <Boolean>]
31+
Set-CsExternalAccessPolicy [-Tenant <Guid>] [-Description <String>] [-EnableFederationAccess <Boolean>] [-CommunicationWithExternalOrgs <Boolean>] [-AllowedExternalDomains <List>] [-BlockedExternalDomains <List>] [-EnableAcsFederationAccess <Boolean>]
3232
[-EnableXmppAccess <Boolean>] [-EnablePublicCloudAccess <Boolean>]
3333
[-RestrictTeamsConsumerAccessToExternalUserProfiles <Boolean>] [-EnableTeamsSmsAccess <Boolean>]
3434
[-EnablePublicCloudAudioVideoAccess <Boolean>] [-EnableTeamsConsumerAccess <Boolean>] [-EnableTeamsConsumerInbound <Boolean>] [-EnableOutsideAccess <Boolean>] [-Instance <PSObject>]
@@ -118,6 +118,14 @@ New-CsExternalAccessPolicy -Identity AcsFederationNotAllowed -EnableAcsFederatio
118118

119119
In this example, the Global policy is updated to allow Teams-ACS federation for all users, then a new external access policy instance is created with Teams-ACS federation disabled and which can then be assigned to selected users for which Team-ACS federation will not be allowed.
120120

121+
### -------------------------- Example 6 ------------------------
122+
```
123+
New-CsExternalAccessPolicy -Identity GranularFederationExample -CommunicationWithExternalOrgs "AllowSpecificExternalDomains" -AllowedExternalDomains @("example1.com", "example2.com")
124+
Set-CsTenantFederationConfiguration -CustomizeFederation $true
125+
```
126+
127+
In this example, we create an ExternalAccessPolicy named "GranularFederationExample" that allows communication with specific external domains, namely `example1.com` and `example2.com`. The federation policy is set to restrict communication to only these allowed domains. After that, we still have to enable the `CustomizeFederation` setting in the TenantFederationConfiguration to allow the federation settings as defined in the ExternalAccessPolicy to work.
128+
121129
## PARAMETERS
122130

123131
### -Identity
@@ -194,6 +202,56 @@ Accept pipeline input: False
194202
Accept wildcard characters: False
195203
```
196204
205+
### -CommunicationWithExternalOrgs
206+
Indicates how the users get assigned by this policy can communicate with the external orgs. There are 5 options:
207+
* OrganizationDefault: the users of this policy will follow the federation settings defined in TenantFederationConfiguration
208+
* AllowAllExternalDomains: the users are open to communicate with all domains
209+
* AllowSpecificExternalDomains: the users can only communicate with the users of the domains defined in `AllowedExternalDomains`
210+
* BlockSpecificExternalDomains: only users from the domains defined in `BlockedExternalDomains` are blocked from communicating with the users of this policy
211+
* BlockAllExternalDomains: the users are not able to communicate with any external domains
212+
```yaml
213+
Type: String
214+
Parameter Sets: (All)
215+
Aliases:
216+
Applicable: Lync Server 2010, Lync Server 2013, Skype for Business Server 2015, Skype for Business Server 2019
217+
218+
Required: False
219+
Position: Named
220+
Default value: OrganizationDefault
221+
Accept pipeline input: False
222+
Accept wildcard characters: False
223+
```
224+
225+
### -AllowedExternalDomains
226+
Indicates the domains that are allowed to communicate with the users of this policy. This is referenced only when `CommunicationWithExternalOrgs` is set to be `AllowSpecificExternalDomains`
227+
```yaml
228+
Type: List
229+
Parameter Sets: (All)
230+
Aliases:
231+
Applicable: Lync Server 2010, Lync Server 2013, Skype for Business Server 2015, Skype for Business Server 2019
232+
233+
Required: False
234+
Position: Named
235+
Default value: None
236+
Accept pipeline input: False
237+
Accept wildcard characters: False
238+
```
239+
240+
### -BlockedExternalDomains
241+
Indicates the domains that are blocked from communicating with the users of this policy. This is referenced only when `CommunicationWithExternalOrgs` is set to be `BlockSpecificExternalDomains`
242+
```yaml
243+
Type: List
244+
Parameter Sets: (All)
245+
Aliases:
246+
Applicable: Lync Server 2010, Lync Server 2013, Skype for Business Server 2015, Skype for Business Server 2019
247+
248+
Required: False
249+
Position: Named
250+
Default value: None
251+
Accept pipeline input: False
252+
Accept wildcard characters: False
253+
```
254+
197255
### -EnableAcsFederationAccess
198256
Indicates whether Teams meeting organized by the user can be joined by users of customer applications built using Azure Communication Services (ACS). This policy setting only applies if ACS Teams federation has been enabled at the tenant level using the cmdlet Set-CsTeamsAcsFederationConfiguration.
199257

teams/teams-ps/teams/Set-CsTenantFederationConfiguration.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Set-CsTenantFederationConfiguration [-Tenant <Guid>]
2424
[-AllowedDomains <IAllowedDomainsChoice>] [-BlockedDomains <List>] [-BlockAllSubdomains <Boolean>]
2525
[-AllowFederatedUsers <Boolean>] [-AllowPublicUsers <Boolean>] [-AllowTeamsConsumer <Boolean>] [-AllowTeamsConsumerInbound <Boolean>]
2626
[-TreatDiscoveredPartnersAsUnverified <Boolean>] [-SharedSipAddressSpace <Boolean>] [-RestrictTeamsConsumerToExternalUserProfiles <Boolean>]
27-
[-AllowedDomainsAsAList <List>] [-ExternalAccessWithTrialTenants <ExternalAccessWithTrialTenantsType>]
27+
[-AllowedDomainsAsAList <List>] [-ExternalAccessWithTrialTenants <ExternalAccessWithTrialTenantsType>] [-CustomizeFederation <Boolean>]
2828
[[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
2929
```
3030

@@ -33,7 +33,7 @@ Set-CsTenantFederationConfiguration [-Tenant <Guid>]
3333
Set-CsTenantFederationConfiguration [-Tenant <Guid>] [-AllowedDomains <IAllowedDomainsChoice>]
3434
[-BlockedDomains <List>] [-BlockAllSubdomains <Boolean>] [-AllowFederatedUsers <Boolean>] [-AllowPublicUsers <Boolean>]
3535
[-TreatDiscoveredPartnersAsUnverified <Boolean>] [-SharedSipAddressSpace <Boolean>] [-RestrictTeamsConsumerToExternalUserProfiles <Boolean>]
36-
[-AllowedDomainsAsAList <List>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
36+
[-AllowedDomainsAsAList <List>] [-CustomizeFederation <Boolean>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
3737
```
3838

3939
## DESCRIPTION
@@ -175,6 +175,13 @@ Set-CsTenantFederationConfiguration -ExternalAccessWithTrialTenants "Allowed"
175175

176176
Example 11 shows how you can allow users to communicate with users in tenants that contain only trial licenses (default value is Blocked).
177177

178+
### -------------------------- Example 12 -------------------------
179+
```
180+
Set-CsTenantFederationConfiguration -CustomizeFederation $True
181+
```
182+
183+
Example 12 shows how you can enable the feature where you can customize your federation in ExternalAccessPolicy.
184+
178185

179186
## PARAMETERS
180187

@@ -484,6 +491,22 @@ Accept pipeline input: False
484491
Accept wildcard characters: False
485492
```
486493

494+
### -CustomizeFederation
495+
Defines if we enable more customized federation settings in ExternalAccessPolicy or not. For example, when this is true, if the `AllowedDomains` includes [a.com, b.com], but the `AllowedExternalDomains` of the ExternalAccessPolicy includes [c.com], then users assigned by the ExternalAccessPolicy will only be allowed to access c.com, all other users will have access to a.com and b.com as defined in `AllowedDomains`.
496+
Possible values: True, False
497+
498+
```yaml
499+
Type: Boolean
500+
Parameter Sets: (All)
501+
Aliases:
502+
503+
Required: False
504+
Position: Named
505+
Default value: False
506+
Accept pipeline input: False
507+
Accept wildcard characters: False
508+
```
509+
487510
### -WhatIf
488511
Describes what would happen if you executed the command without actually executing the command.
489512

0 commit comments

Comments
 (0)