Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit b7a089c

Browse files
author
Jason Helmick
authored
Merge pull request #58 from theJasonHelmick/Dev-Bugfix
Dev bugfix
2 parents 4cae3a9 + d8522ff commit b7a089c

File tree

11 files changed

+526
-56
lines changed

11 files changed

+526
-56
lines changed

‎Configurations/POC-MultiRole/VMConfiguration.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
2424

2525
#region DSC Resources
2626
Import-DSCresource -ModuleName PSDesiredStateConfiguration,
27-
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="4.0.0.0"},
28-
@{ModuleName="xActiveDirectory";ModuleVersion="2.13.0.0"},
27+
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="5.0.0.0"},
28+
@{ModuleName="xActiveDirectory";ModuleVersion="2.14.0.0"},
2929
@{ModuleName="xComputerManagement";ModuleVersion="1.8.0.0"},
30-
@{ModuleName="xNetworking";ModuleVersion="2.12.0.0"},
30+
@{ModuleName="xNetworking";ModuleVersion="3.0.0.0"},
3131
@{ModuleName="xDhcpServer";ModuleVersion="1.5.0.0"},
3232
@{ModuleName='xWindowsUpdate';ModuleVersion = '2.5.0.0'},
3333
@{ModuleName='xPendingReboot';ModuleVersion = '0.3.0.0'},
@@ -53,7 +53,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
5353
xIPAddress 'PrimaryIPAddress' {
5454
IPAddress = $node.IPAddress
5555
InterfaceAlias = $node.InterfaceAlias
56-
SubnetMask = $node.SubnetMask
56+
PrefixLength = $node.SubnetMask
5757
AddressFamily = $node.AddressFamily
5858
}
5959

@@ -236,7 +236,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
236236
GroupScope = 'Global'
237237
DependsOn = '[xADOrganizationalUnit]IT'
238238
Members = $WebServers
239-
Credential = $EACredential
239+
Credential = $DomainCredential
240240
Category = 'Security'
241241
Path = "OU=IT,$($Node.DomainDN)"
242242
Ensure = 'Present'

‎Configurations/POC-MultiRole/VMConfigurationData.psd1

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ demonstrations and would need to be modified for your environment.
133133
CustomBootStrap = @'
134134
# To enable PSRemoting on the client
135135
Enable-PSRemoting -SkipNetworkProfileCheck -Force;
136+
# To enable RDP
137+
Set-ItemProperty -Path "HKLM:\System\ControlSet001\Control\Terminal Server" -Name "fDenyTSConnections" -Value 0;
138+
136139
'@
137140
}
138141

@@ -171,14 +174,14 @@ demonstrations and would need to be modified for your environment.
171174
);
172175
DSCResource = @(
173176
## Download published version from the PowerShell Gallery or Github
174-
@{ Name = 'xActiveDirectory'; RequiredVersion="2.13.0.0"; Provider = 'PSGallery'; },
177+
@{ Name = 'xActiveDirectory'; RequiredVersion="2.14.0.0"; Provider = 'PSGallery'; },
175178
@{ Name = 'xComputerManagement'; RequiredVersion = '1.8.0.0'; Provider = 'PSGallery'; },
176-
@{ Name = 'xNetworking'; RequiredVersion = '2.12.0.0'; Provider = 'PSGallery'; },
179+
@{ Name = 'xNetworking'; RequiredVersion = '3.0.0.0'; Provider = 'PSGallery'; },
177180
@{ Name = 'xDhcpServer'; RequiredVersion = '1.5.0.0'; Provider = 'PSGallery'; },
178181
@{ Name = 'xWindowsUpdate' ; RequiredVersion = '2.5.0.0'; Provider = 'PSGallery';},
179-
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '4.0.0.0'; },
182+
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '5.0.0.0'; },
180183
@{ Name = 'xPendingReboot'; RequiredVersion = '0.3.0.0'; },
181-
@{ Name = 'xADCSDeployment'; RequiredVersion = '1.0.0.0'; }
184+
@{ Name = 'xADCSDeployment'; RequiredVersion = '1.0.0.0'; }
182185

183186
);
184187
Resource = @(

‎Configurations/TEST-SingleDC/VMConfiguration.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
2424

2525
#region DSC Resources
2626
Import-DSCresource -ModuleName PSDesiredStateConfiguration,
27-
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="4.0.0.0"},
28-
@{ModuleName="xActiveDirectory";ModuleVersion="2.13.0.0"},
27+
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="5.0.0.0"},
28+
@{ModuleName="xActiveDirectory";ModuleVersion="2.14.0.0"},
2929
@{ModuleName="xComputerManagement";ModuleVersion="1.8.0.0"},
30-
@{ModuleName="xNetworking";ModuleVersion="2.12.0.0"},
30+
@{ModuleName="xNetworking";ModuleVersion="3.0.0.0"},
3131
@{ModuleName="xDhcpServer";ModuleVersion="1.5.0.0"},
3232
@{ModuleName='xWindowsUpdate';ModuleVersion = '2.5.0.0'},
3333
@{ModuleName='xPendingReboot';ModuleVersion = '0.3.0.0'},
@@ -53,7 +53,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
5353
xIPAddress 'PrimaryIPAddress' {
5454
IPAddress = $node.IPAddress
5555
InterfaceAlias = $node.InterfaceAlias
56-
SubnetMask = $node.SubnetMask
56+
PrefixLength = $node.SubnetMask
5757
AddressFamily = $node.AddressFamily
5858
}
5959

@@ -236,7 +236,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
236236
GroupScope = 'Global'
237237
DependsOn = '[xADOrganizationalUnit]IT'
238238
Members = $WebServers
239-
Credential = $EACredential
239+
Credential = $DomainCredential
240240
Category = 'Security'
241241
Path = "OU=IT,$($Node.DomainDN)"
242242
Ensure = 'Present'

‎Configurations/TEST-SingleDC/VMConfigurationData.psd1

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ demonstrations and would need to be modified for your environment.
6969
# Lability default node settings
7070
Lability_SwitchName = 'LabNet'
7171
Lability_ProcessorCount = 1
72-
Lability_StartupMemory = 1GB
72+
Lability_MinimumMemory = 1GB
7373
SecureBoot = $false
7474
Lability_Media = '2016_x64_Standard_Core_EN_Eval' # Can be Core,Win10,2012R2,nano
7575
# 2016_x64_Standard_EN_Eval
@@ -94,7 +94,7 @@ demonstrations and would need to be modified for your environment.
9494
Lability_BootDelay = 60 # Number of seconds to delay before others
9595
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
9696
Lability_Media = '2016_x64_Standard_EN_Eval'
97-
Lability_StartupMemory = 2GB
97+
Lability_MinimumMemory = 2GB
9898
Lability_ProcessorCount = 2
9999
CustomBootStrap = @'
100100
# This must be set to handle larger .mof files
@@ -118,22 +118,24 @@ demonstrations and would need to be modified for your environment.
118118
Lability_BootOrder = 20
119119
Lability_Media = '2016_x64_Standard_Nano_DSC_EN_Eval'
120120
Lability_ProcessorCount = 1
121-
Lability_StartupMemory = 1GB
121+
Lability_MinimumMemory = 1GB
122122
}
123123
124124
@{
125125
NodeName = 'Cli1'
126126
IPAddress = '192.168.3.100'
127127
Role = @('domainJoin', 'RSAT')
128128
Lability_ProcessorCount = 2
129-
Lability_StartupMemory = 4GB
129+
Lability_MinimumMemory = 4GB
130130
Lability_Media = 'WIN10_x64_Enterprise_EN_Eval'
131131
Lability_BootOrder = 20
132132
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
133133
Lability_Resource = @('Win10RSAT')
134134
CustomBootStrap = @'
135135
# To enable PSRemoting on the client
136136
Enable-PSRemoting -SkipNetworkProfileCheck -Force;
137+
# To enable RDP
138+
Set-ItemProperty -Path "HKLM:\System\ControlSet001\Control\Terminal Server" -Name "fDenyTSConnections" -Value 0;
137139
'@
138140
}
139141
#>
@@ -172,14 +174,14 @@ demonstrations and would need to be modified for your environment.
172174
);
173175
DSCResource = @(
174176
## Download published version from the PowerShell Gallery or Github
175-
@{ Name = 'xActiveDirectory'; RequiredVersion="2.13.0.0"; Provider = 'PSGallery'; },
177+
@{ Name = 'xActiveDirectory'; RequiredVersion="2.14.0.0"; Provider = 'PSGallery'; },
176178
@{ Name = 'xComputerManagement'; RequiredVersion = '1.8.0.0'; Provider = 'PSGallery'; },
177-
@{ Name = 'xNetworking'; RequiredVersion = '2.12.0.0'; Provider = 'PSGallery'; },
179+
@{ Name = 'xNetworking'; RequiredVersion = '3.0.0.0'; Provider = 'PSGallery'; },
178180
@{ Name = 'xDhcpServer'; RequiredVersion = '1.5.0.0'; Provider = 'PSGallery'; },
179181
@{ Name = 'xWindowsUpdate' ; RequiredVersion = '2.5.0.0'; Provider = 'PSGallery';},
180-
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '4.0.0.0'; },
182+
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '5.0.0.0'; },
181183
@{ Name = 'xPendingReboot'; RequiredVersion = '0.3.0.0'; },
182-
@{ Name = 'xADCSDeployment'; RequiredVersion = '1.0.0.0'; }
184+
@{ Name = 'xADCSDeployment'; RequiredVersion = '1.0.0.0'; }
183185

184186
);
185187
Resource = @(

‎Configurations/TEST-SingleServer/VMConfiguration.ps1

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
2323

2424
#region DSC Resources
2525
Import-DSCresource -ModuleName PSDesiredStateConfiguration,
26-
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="4.0.0.0"},
27-
@{ModuleName="xActiveDirectory";ModuleVersion="2.13.0.0"},
26+
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="5.0.0.0"},
2827
@{ModuleName="xComputerManagement";ModuleVersion="1.8.0.0"},
29-
@{ModuleName="xNetworking";ModuleVersion="2.12.0.0"},
30-
@{ModuleName="xDhcpServer";ModuleVersion="1.5.0.0"},
31-
@{ModuleName='xWindowsUpdate';ModuleVersion = '2.5.0.0'},
32-
@{ModuleName='xPendingReboot';ModuleVersion = '0.3.0.0'}
28+
@{ModuleName="xNetworking";ModuleVersion="3.0.0.0"},
29+
@{ModuleName='xWindowsUpdate';ModuleVersion = '2.5.0.0'}
30+
3331

3432
#endregion
3533

@@ -51,7 +49,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
5149
xIPAddress 'PrimaryIPAddress' {
5250
IPAddress = $node.IPAddress
5351
InterfaceAlias = $node.InterfaceAlias
54-
SubnetMask = $node.SubnetMask
52+
PrefixLength = $node.SubnetMask
5553
AddressFamily = $node.AddressFamily
5654
}
5755

‎Configurations/TEST-SingleServer/VMConfigurationData.psd1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ demonstrations and would need to be modified for your environment.
119119
CutomBootStrap = @'
120120
# To enable PSRemoting on the client
121121
Enable-PSRemoting -SkipNetworkProfileCheck -Force;
122+
# To enable RDP
123+
Set-ItemProperty -Path "HKLM:\System\ControlSet001\Control\Terminal Server" -Name "fDenyTSConnections" -Value 0;
124+
122125
'@
123126
}
124127
#>
@@ -159,10 +162,10 @@ demonstrations and would need to be modified for your environment.
159162
## Download published version from the PowerShell Gallery or Github
160163
#@{ Name = 'xActiveDirectory'; RequiredVersion="2.13.0.0"; Provider = 'PSGallery'; },
161164
@{ Name = 'xComputerManagement'; RequiredVersion = '1.8.0.0'; Provider = 'PSGallery'; },
162-
@{ Name = 'xNetworking'; RequiredVersion = '2.12.0.0'; Provider = 'PSGallery'; },
165+
@{ Name = 'xNetworking'; RequiredVersion = '3.0.0.0'; Provider = 'PSGallery'; },
163166
#@{ Name = 'xDhcpServer'; RequiredVersion = '1.5.0.0'; Provider = 'PSGallery'; },
164167
@{ Name = 'xWindowsUpdate' ; RequiredVersion = '2.5.0.0'; Provider = 'PSGallery';},
165-
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '4.0.0.0'; }
168+
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '5.0.0.0'; }
166169
#@{ Name = 'xPendingReboot'; RequiredVersion = '0.3.0.0'; }
167170

168171

‎Configurations/devops-powershell-fundamentals/VMConfiguration.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
2424

2525
#region DSC Resources
2626
Import-DSCresource -ModuleName PSDesiredStateConfiguration,
27-
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="4.0.0.0"},
28-
@{ModuleName="xActiveDirectory";ModuleVersion="2.13.0.0"},
27+
@{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="5.0.0.0"},
28+
@{ModuleName="xActiveDirectory";ModuleVersion="2.14.0.0"},
2929
@{ModuleName="xComputerManagement";ModuleVersion="1.8.0.0"},
30-
@{ModuleName="xNetworking";ModuleVersion="2.12.0.0"},
30+
@{ModuleName="xNetworking";ModuleVersion="3.0.0.0"},
3131
@{ModuleName="xDhcpServer";ModuleVersion="1.5.0.0"},
3232
@{ModuleName='xWindowsUpdate';ModuleVersion = '2.5.0.0'},
33-
@{ModuleName='xPendingReboot';ModuleVersion = '0.3.0.0'}
33+
@{ModuleName='xPendingReboot';ModuleVersion = '0.3.0.0'},
34+
@{ModuleName='xADCSDeployment';ModuleVersion = '1.0.0.0'}
3435

3536
#endregion
3637

@@ -52,7 +53,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
5253
xIPAddress 'PrimaryIPAddress' {
5354
IPAddress = $node.IPAddress
5455
InterfaceAlias = $node.InterfaceAlias
55-
SubnetMask = $node.SubnetMask
56+
PrefixLength = $node.SubnetMask
5657
AddressFamily = $node.AddressFamily
5758
}
5859

‎Configurations/devops-powershell-fundamentals/VMConfigurationData.psd1

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ demonstrations and would need to be modified for your environment.
128128
CustomBootStrap = @'
129129
# To enable PSRemoting on the client
130130
Enable-PSRemoting -SkipNetworkProfileCheck -Force;
131+
# To enable RDP
132+
Set-ItemProperty -Path "HKLM:\System\ControlSet001\Control\Terminal Server" -Name "fDenyTSConnections" -Value 0;
133+
131134
'@
132135
}
133136

@@ -166,13 +169,14 @@ demonstrations and would need to be modified for your environment.
166169
);
167170
DSCResource = @(
168171
## Download published version from the PowerShell Gallery or Github
169-
@{ Name = 'xActiveDirectory'; RequiredVersion="2.13.0.0"; Provider = 'PSGallery'; },
172+
@{ Name = 'xActiveDirectory'; RequiredVersion="2.14.0.0"; Provider = 'PSGallery'; },
170173
@{ Name = 'xComputerManagement'; RequiredVersion = '1.8.0.0'; Provider = 'PSGallery'; },
171-
@{ Name = 'xNetworking'; RequiredVersion = '2.12.0.0'; Provider = 'PSGallery'; },
174+
@{ Name = 'xNetworking'; RequiredVersion = '3.0.0.0'; Provider = 'PSGallery'; },
172175
@{ Name = 'xDhcpServer'; RequiredVersion = '1.5.0.0'; Provider = 'PSGallery'; },
173176
@{ Name = 'xWindowsUpdate' ; RequiredVersion = '2.5.0.0'; Provider = 'PSGallery';},
174-
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '4.0.0.0'; },
175-
@{ Name = 'xPendingReboot'; RequiredVersion = '0.3.0.0'; }
177+
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '5.0.0.0'; },
178+
@{ Name = 'xPendingReboot'; RequiredVersion = '0.3.0.0'; },
179+
@{ Name = 'xADCSDeployment'; RequiredVersion = '1.0.0.0'; }
176180

177181

178182
);

0 commit comments

Comments
 (0)