diff --git a/DSCResources/MSFT_ADComputer/en-US/about_ADComputer.help.txt b/DSCResources/MSFT_ADComputer/en-US/about_ADComputer.help.txt index ebe5b7e28..952134665 100644 --- a/DSCResources/MSFT_ADComputer/en-US/about_ADComputer.help.txt +++ b/DSCResources/MSFT_ADComputer/en-US/about_ADComputer.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADComputer .DESCRIPTION diff --git a/DSCResources/MSFT_ADDomain/en-US/about_ADDomain.help.txt b/DSCResources/MSFT_ADDomain/en-US/about_ADDomain.help.txt index 7675b8f66..4a6051983 100644 --- a/DSCResources/MSFT_ADDomain/en-US/about_ADDomain.help.txt +++ b/DSCResources/MSFT_ADDomain/en-US/about_ADDomain.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADDomain .DESCRIPTION diff --git a/DSCResources/MSFT_ADDomainController/en-US/about_ADDomainController.help.txt b/DSCResources/MSFT_ADDomainController/en-US/about_ADDomainController.help.txt index 1a84944ed..9fb7cd48d 100644 --- a/DSCResources/MSFT_ADDomainController/en-US/about_ADDomainController.help.txt +++ b/DSCResources/MSFT_ADDomainController/en-US/about_ADDomainController.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADDomainController .DESCRIPTION diff --git a/DSCResources/MSFT_ADDomainDefaultPasswordPolicy/en-US/about_ADDomainDefaultPasswordPolicy.help.txt b/DSCResources/MSFT_ADDomainDefaultPasswordPolicy/en-US/about_ADDomainDefaultPasswordPolicy.help.txt index f18206efd..379157f62 100644 --- a/DSCResources/MSFT_ADDomainDefaultPasswordPolicy/en-US/about_ADDomainDefaultPasswordPolicy.help.txt +++ b/DSCResources/MSFT_ADDomainDefaultPasswordPolicy/en-US/about_ADDomainDefaultPasswordPolicy.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADDomainDefaultPasswordPolicy .DESCRIPTION diff --git a/DSCResources/MSFT_ADDomainTrust/en-US/about_ADDomainTrust.help.txt b/DSCResources/MSFT_ADDomainTrust/en-US/about_ADDomainTrust.help.txt index c1b955a39..b15da88af 100644 --- a/DSCResources/MSFT_ADDomainTrust/en-US/about_ADDomainTrust.help.txt +++ b/DSCResources/MSFT_ADDomainTrust/en-US/about_ADDomainTrust.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADDomainTrust .DESCRIPTION @@ -35,12 +35,16 @@ Key - String Specifies the name of the Active Directory domain that is requesting the trust. +.PARAMETER AllowTrustRecreation + Write - Boolean + Specifies if the is allowed to be recreated if required. Default value is $false. + .EXAMPLE 1 This configuration will create a new one way inbound trust between two domains. -Configuration ADDomainTrust_NewOneWayTrust_Config +Configuration ADDomainTrust_ExternalInboundTrust_Config { param ( @@ -73,4 +77,44 @@ Configuration ADDomainTrust_NewOneWayTrust_Config } } +.EXAMPLE 2 + +This configuration will create a new one way inbound trust between two +domains, and allows the trust to recreated if it should have the wrong +trust type. + +Configuration ADDomainTrust_ExternalInboundTrustWithOptInToRecreate_Config +{ + param + ( + [Parameter(Mandatory = $true)] + [System.String] + $SourceDomain, + + [Parameter(Mandatory = $true)] + [System.String] + $TargetDomain, + + [Parameter(Mandatory = $true)] + [System.Management.Automation.PSCredential] + $TargetDomainAdminCred + ) + + Import-DscResource -module ActiveDirectoryDsc + + node localhost + { + ADDomainTrust 'Trust' + { + Ensure = 'Present' + SourceDomainName = $SourceDomain + TargetDomainName = $TargetDomain + TargetCredential = $TargetDomainAdminCred + TrustDirection = 'Inbound' + TrustType = 'External' + AllowTrustRecreation = $true + } + } +} + diff --git a/DSCResources/MSFT_ADForestProperties/en-US/about_ADForestProperties.help.txt b/DSCResources/MSFT_ADForestProperties/en-US/about_ADForestProperties.help.txt index 6aaae6968..fc44fe8e2 100644 --- a/DSCResources/MSFT_ADForestProperties/en-US/about_ADForestProperties.help.txt +++ b/DSCResources/MSFT_ADForestProperties/en-US/about_ADForestProperties.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADForestProperties .DESCRIPTION @@ -52,7 +52,7 @@ Configuration ADForestProperties_ReplaceForestProperties_Config node 'localhost' { - ADForestProperties $Node.ForestName + ADForestProperties 'contoso.com' { ForestName = 'contoso.com' UserPrincipalNameSuffix = 'fabrikam.com', 'industry.com' diff --git a/DSCResources/MSFT_ADGroup/en-US/about_ADGroup.help.txt b/DSCResources/MSFT_ADGroup/en-US/about_ADGroup.help.txt index b721b4159..3b14cceee 100644 --- a/DSCResources/MSFT_ADGroup/en-US/about_ADGroup.help.txt +++ b/DSCResources/MSFT_ADGroup/en-US/about_ADGroup.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADGroup .DESCRIPTION diff --git a/DSCResources/MSFT_ADKDSKey/en-US/about_ADKDSKey.help.txt b/DSCResources/MSFT_ADKDSKey/en-US/about_ADKDSKey.help.txt index 9d72ef3d1..04345999c 100644 --- a/DSCResources/MSFT_ADKDSKey/en-US/about_ADKDSKey.help.txt +++ b/DSCResources/MSFT_ADKDSKey/en-US/about_ADKDSKey.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADKDSKey .DESCRIPTION diff --git a/DSCResources/MSFT_ADManagedServiceAccount/en-US/about_ADManagedServiceAccount.help.txt b/DSCResources/MSFT_ADManagedServiceAccount/en-US/about_ADManagedServiceAccount.help.txt index 9eb5b9b97..08381fb7e 100644 --- a/DSCResources/MSFT_ADManagedServiceAccount/en-US/about_ADManagedServiceAccount.help.txt +++ b/DSCResources/MSFT_ADManagedServiceAccount/en-US/about_ADManagedServiceAccount.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADManagedServiceAccount .DESCRIPTION diff --git a/DSCResources/MSFT_ADObjectEnabledState/en-US/about_ADObjectEnabledState.help.txt b/DSCResources/MSFT_ADObjectEnabledState/en-US/about_ADObjectEnabledState.help.txt index 66cc24821..e4e37e377 100644 --- a/DSCResources/MSFT_ADObjectEnabledState/en-US/about_ADObjectEnabledState.help.txt +++ b/DSCResources/MSFT_ADObjectEnabledState/en-US/about_ADObjectEnabledState.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADObjectEnabledState .DESCRIPTION diff --git a/DSCResources/MSFT_ADObjectPermissionEntry/en-US/about_ADObjectPermissionEntry.help.txt b/DSCResources/MSFT_ADObjectPermissionEntry/en-US/about_ADObjectPermissionEntry.help.txt index 9803a6454..d502d19ba 100644 --- a/DSCResources/MSFT_ADObjectPermissionEntry/en-US/about_ADObjectPermissionEntry.help.txt +++ b/DSCResources/MSFT_ADObjectPermissionEntry/en-US/about_ADObjectPermissionEntry.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADObjectPermissionEntry .DESCRIPTION diff --git a/DSCResources/MSFT_ADOrganizationalUnit/en-US/about_ADOrganizationalUnit.help.txt b/DSCResources/MSFT_ADOrganizationalUnit/en-US/about_ADOrganizationalUnit.help.txt index 9abd8f88f..383604ac3 100644 --- a/DSCResources/MSFT_ADOrganizationalUnit/en-US/about_ADOrganizationalUnit.help.txt +++ b/DSCResources/MSFT_ADOrganizationalUnit/en-US/about_ADOrganizationalUnit.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADOrganizationalUnit .DESCRIPTION diff --git a/DSCResources/MSFT_ADRecycleBin/en-US/about_ADRecycleBin.help.txt b/DSCResources/MSFT_ADRecycleBin/en-US/about_ADRecycleBin.help.txt index b9622ee9d..d9be4cfc3 100644 --- a/DSCResources/MSFT_ADRecycleBin/en-US/about_ADRecycleBin.help.txt +++ b/DSCResources/MSFT_ADRecycleBin/en-US/about_ADRecycleBin.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADRecycleBin .DESCRIPTION diff --git a/DSCResources/MSFT_ADReplicationSite/en-US/about_ADReplicationSite.help.txt b/DSCResources/MSFT_ADReplicationSite/en-US/about_ADReplicationSite.help.txt index bfe0abf62..02ed977f6 100644 --- a/DSCResources/MSFT_ADReplicationSite/en-US/about_ADReplicationSite.help.txt +++ b/DSCResources/MSFT_ADReplicationSite/en-US/about_ADReplicationSite.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADReplicationSite .DESCRIPTION diff --git a/DSCResources/MSFT_ADReplicationSiteLink/en-US/about_ADReplicationSiteLink.help.txt b/DSCResources/MSFT_ADReplicationSiteLink/en-US/about_ADReplicationSiteLink.help.txt index d8d342cb4..dd806ba52 100644 --- a/DSCResources/MSFT_ADReplicationSiteLink/en-US/about_ADReplicationSiteLink.help.txt +++ b/DSCResources/MSFT_ADReplicationSiteLink/en-US/about_ADReplicationSiteLink.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADReplicationSiteLink .DESCRIPTION diff --git a/DSCResources/MSFT_ADReplicationSubnet/en-US/about_ADReplicationSubnet.help.txt b/DSCResources/MSFT_ADReplicationSubnet/en-US/about_ADReplicationSubnet.help.txt index 204f84423..fa955a402 100644 --- a/DSCResources/MSFT_ADReplicationSubnet/en-US/about_ADReplicationSubnet.help.txt +++ b/DSCResources/MSFT_ADReplicationSubnet/en-US/about_ADReplicationSubnet.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADReplicationSubnet .DESCRIPTION diff --git a/DSCResources/MSFT_ADServicePrincipalName/en-US/about_ADServicePrincipalName.help.txt b/DSCResources/MSFT_ADServicePrincipalName/en-US/about_ADServicePrincipalName.help.txt index 4d070b48b..929c087d2 100644 --- a/DSCResources/MSFT_ADServicePrincipalName/en-US/about_ADServicePrincipalName.help.txt +++ b/DSCResources/MSFT_ADServicePrincipalName/en-US/about_ADServicePrincipalName.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADServicePrincipalName .DESCRIPTION diff --git a/DSCResources/MSFT_ADUser/en-US/about_ADUser.help.txt b/DSCResources/MSFT_ADUser/en-US/about_ADUser.help.txt index 9e83a95e0..40c673993 100644 --- a/DSCResources/MSFT_ADUser/en-US/about_ADUser.help.txt +++ b/DSCResources/MSFT_ADUser/en-US/about_ADUser.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME ADUser .DESCRIPTION diff --git a/DSCResources/MSFT_WaitForADDomain/en-US/about_WaitForADDomain.help.txt b/DSCResources/MSFT_WaitForADDomain/en-US/about_WaitForADDomain.help.txt index 84b091723..7726bd166 100644 --- a/DSCResources/MSFT_WaitForADDomain/en-US/about_WaitForADDomain.help.txt +++ b/DSCResources/MSFT_WaitForADDomain/en-US/about_WaitForADDomain.help.txt @@ -1,4 +1,4 @@ -.NAME +.NAME WaitForADDomain .DESCRIPTION