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

Commit 94855b6

Browse files
author
Jason Helmick
committed
Convergence update
1 parent ead2497 commit 94855b6

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
8787
#region Firewall Rules
8888

8989
$LabData = Import-PowerShellDataFile .\*.psd1
90-
$FireWallRules = $labdata.Allnodes.FirealllRuleNames
90+
$FireWallRules = $labdata.Allnodes.FirewallRuleNames
9191

9292
foreach ($Rule in $FireWallRules) {
9393
xFirewall $Rule {
94-
Name = $Rule.name
94+
Name = $Rule
9595
Enabled = 'True'
9696
}
9797
} #End foreach
@@ -117,7 +117,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
117117
'RSAT-AD-PowerShell'
118118
#For Gui, might like
119119
#'RSAT-DNS-Server',
120-
#'GPMC,
120+
#'GPMC',
121121
#'RSAT-AD-AdminCenter',
122122
#'RSAT-ADDS-Tools'
123123

@@ -173,6 +173,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
173173
DomainAdministratorCredential = $DomainCredential
174174
PasswordNeverExpires = $True
175175
DependsOn = '[xADDomain]FirstDC'
176+
PasswordAuthentication = 'Negotiate'
176177
}
177178
} #user
178179

@@ -209,8 +210,6 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
209210
}
210211

211212
#add Web Servers group with Web Server computer objects as members
212-
213-
If ($WebServers -ne $Null) {
214213

215214
xADGroup WebServerGroup {
216215
GroupName = 'Web Servers'
@@ -222,7 +221,6 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
222221
Path = "OU=IT,$($Node.DomainDN)"
223222
Ensure = 'Present'
224223
}
225-
}
226224

227225
} #end nodes DC
228226

@@ -232,8 +230,8 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
232230
node $AllNodes.Where({$_.Role -eq 'DHCP'}).NodeName {
233231

234232
foreach ($feature in @(
235-
'DHCP',
236-
'RSAT-DHCP'
233+
'DHCP'
234+
#'RSAT-DHCP'
237235
)) {
238236

239237
WindowsFeature $feature.Replace('-','') {
@@ -362,9 +360,10 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
362360
'ADCS-Cert-Authority',
363361
'ADCS-Enroll-Web-Pol',
364362
'ADCS-Enroll-Web-Svc',
365-
'ADCS-Web-Enrollment',
366-
'RSAT-ADCS',
367-
'RSAT-ADCS-Mgmt'
363+
'ADCS-Web-Enrollment'
364+
# For the GUI version - uncomment the following
365+
#'RSAT-ADCS',
366+
#'RSAT-ADCS-Mgmt'
368367
)) {
369368

370369
WindowsFeature $feature.Replace('-','') {

‎Configurations/microsoft-powershell-implementing-jea/VMConfiguration.ps1

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
8787
#region Firewall Rules
8888

8989
$LabData = Import-PowerShellDataFile .\*.psd1
90-
$FireWallRules = $labdata.Allnodes.FirealllRuleNames
90+
$FireWallRules = $labdata.Allnodes.FirewallRuleNames
9191

9292
foreach ($Rule in $FireWallRules) {
9393
xFirewall $Rule {
94-
Name = $Rule.name
94+
Name = $Rule
9595
Enabled = 'True'
9696
}
9797
} #End foreach
@@ -117,7 +117,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
117117
'RSAT-AD-PowerShell'
118118
#For Gui, might like
119119
#'RSAT-DNS-Server',
120-
#'GPMC,
120+
#'GPMC',
121121
#'RSAT-AD-AdminCenter',
122122
#'RSAT-ADDS-Tools'
123123

@@ -173,6 +173,7 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
173173
DomainAdministratorCredential = $DomainCredential
174174
PasswordNeverExpires = $True
175175
DependsOn = '[xADDomain]FirstDC'
176+
PasswordAuthentication = 'Negotiate'
176177
}
177178
} #user
178179

@@ -209,8 +210,6 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
209210
}
210211

211212
#add Web Servers group with Web Server computer objects as members
212-
213-
If ($WebServers -ne $Null) {
214213

215214
xADGroup WebServerGroup {
216215
GroupName = 'Web Servers'
@@ -222,7 +221,6 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
222221
Path = "OU=IT,$($Node.DomainDN)"
223222
Ensure = 'Present'
224223
}
225-
}
226224

227225
} #end nodes DC
228226

@@ -232,8 +230,8 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
232230
node $AllNodes.Where({$_.Role -eq 'DHCP'}).NodeName {
233231

234232
foreach ($feature in @(
235-
'DHCP',
236-
'RSAT-DHCP'
233+
'DHCP'
234+
#'RSAT-DHCP'
237235
)) {
238236

239237
WindowsFeature $feature.Replace('-','') {
@@ -362,9 +360,10 @@ $credential = New-Object -typename Pscredential -ArgumentList Administrator, $se
362360
'ADCS-Cert-Authority',
363361
'ADCS-Enroll-Web-Pol',
364362
'ADCS-Enroll-Web-Svc',
365-
'ADCS-Web-Enrollment',
366-
'RSAT-ADCS',
367-
'RSAT-ADCS-Mgmt'
363+
'ADCS-Web-Enrollment'
364+
# For the GUI version - uncomment the following
365+
#'RSAT-ADCS',
366+
#'RSAT-ADCS-Mgmt'
368367
)) {
369368

370369
WindowsFeature $feature.Replace('-','') {

0 commit comments

Comments
 (0)