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

Commit

Permalink
v4.22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdhitsolutions
jdhitsolutions committed May 19, 2022
1 parent fa9023d commit f2a7db4
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 126 deletions.
4 changes: 2 additions & 2 deletions Configurations/PowerShellLab/Instructions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This lab builds the following:
MemoryGB : 1

Computername : WIN10
Description : Windows 10 64bit Enterprise 2009 English Evaluation (20H2)
Description : Windows 10 64bit Enterprise 2109/21H2 English Evaluation
Role : {domainJoin, RDP, RSAT}
IPAddress : 192.168.3.100
MemoryGB : 4
Expand Down Expand Up @@ -130,4 +130,4 @@ property IsSingleInstance` you might have an older version of a DSCResource modu
Run `Get-Module xdhcpserver -list` and remove anything older than version 3.0.0.

uninstall-module xdhcpserver -RequiredVersion 2.0.0.0
get-la
get-la
132 changes: 49 additions & 83 deletions Configurations/PowerShellLab/VMConfigurationData.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ This example code is provided without copyright and AS IS. It is free for you t
@{
AllNodes = @(
@{
NodeName = '*'
NodeName = '*'

# Lab Password - assigned to Administrator and Users
LabPassword = 'P@ssw0rd'
LabPassword = 'P@ssw0rd'

# Common networking
InterfaceAlias = 'Ethernet'
DefaultGateway = '192.168.3.1'
SubnetMask = 24
AddressFamily = 'IPv4'
IPNetwork = '192.168.3.0/24'
IPNatName = 'LabNat'
DnsServerAddress = '192.168.3.10'
InterfaceAlias = 'Ethernet'
DefaultGateway = '192.168.3.1'
SubnetMask = 24
AddressFamily = 'IPv4'
IPNetwork = '192.168.3.0/24'
IPNatName = 'LabNat'
DnsServerAddress = '192.168.3.10'

# Firewall settings to enable
FirewallRuleNames = @(
FirewallRuleNames = @(
'FPS-ICMP4-ERQ-In',
'FPS-ICMP6-ERQ-In',
'FPS-SMB-In-TCP',
Expand All @@ -40,83 +40,48 @@ This example code is provided without copyright and AS IS. It is free for you t
)

# Domain and Domain Controller information
DomainName = "Company.Pri"
DomainDN = "DC=Company,DC=Pri"
DCDatabasePath = "C:\NTDS"
DCLogPath = "C:\NTDS"
SysvolPath = "C:\Sysvol"
PSDscAllowPlainTextPassword = $true
PSDscAllowDomainUser = $true
DomainName = "Company.Pri"
DomainDN = "DC=Company,DC=Pri"
DCDatabasePath = "C:\NTDS"
DCLogPath = "C:\NTDS"
SysvolPath = "C:\Sysvol"
PSDscAllowPlainTextPassword = $true
PSDscAllowDomainUser = $true

# DHCP Server Data
DHCPName = 'LabNet'
DHCPIPStartRange = '192.168.3.200'
DHCPIPEndRange = '192.168.3.250'
DHCPSubnetMask = '255.255.255.0'
DHCPState = 'Active'
DHCPAddressFamily = 'IPv4'
DHCPLeaseDuration = '00:08:00'
DHCPScopeID = '192.168.3.0'
DHCPDnsServerIPAddress = '192.168.3.10'
DHCPRouter = '192.168.3.1'
DHCPName = 'LabNet'
DHCPIPStartRange = '192.168.3.200'
DHCPIPEndRange = '192.168.3.250'
DHCPSubnetMask = '255.255.255.0'
DHCPState = 'Active'
DHCPAddressFamily = 'IPv4'
DHCPLeaseDuration = '00:08:00'
DHCPScopeID = '192.168.3.0'
DHCPDnsServerIPAddress = '192.168.3.10'
DHCPRouter = '192.168.3.1'

# ADCS Certificate Services information
CACN = 'Company.Pri'
CADNSuffix = "C=US,L=Phoenix,S=Arizona,O=Company"
CADatabasePath = "C:\windows\system32\CertLog"
CALogPath = "C:\CA_Logs"
ADCSCAType = 'EnterpriseRootCA'
ADCSCryptoProviderName = 'RSA#Microsoft Software Key Storage Provider'
ADCSHashAlgorithmName = 'SHA256'
ADCSKeyLength = 2048
ADCSValidityPeriod = 'Years'
ADCSValidityPeriodUnits = 2
CACN = 'Company.Pri'
CADNSuffix = "C=US,L=Phoenix,S=Arizona,O=Company"
CADatabasePath = "C:\windows\system32\CertLog"
CALogPath = "C:\CA_Logs"
ADCSCAType = 'EnterpriseRootCA'
ADCSCryptoProviderName = 'RSA#Microsoft Software Key Storage Provider'
ADCSHashAlgorithmName = 'SHA256'
ADCSKeyLength = 2048
ADCSValidityPeriod = 'Years'
ADCSValidityPeriodUnits = 2

# Lability default node settings
Lability_SwitchName = 'LabNet'
Lability_ProcessorCount = 1
Lability_MinimumMemory = 1GB
Lability_MaximumMemory = 3GB
SecureBoot = $false
Lability_Media = '2016_x64_Standard_Core_EN_Eval'
<#
Id Arch Media Description
-- ---- ----- -----------
2019_x64_Standard_EN_Eval x64 ISO Windows Server 2019 Standard 64bit English Evaluation with Desktop Experience
2019_x64_Standard_EN_Core_Eval x64 ISO Windows Server 2019 Standard 64bit English Evaluation
2019_x64_Datacenter_EN_Eval x64 ISO Windows Server 2019 Datacenter 64bit English Evaluation with Desktop Experience
2019_x64_Datacenter_EN_Core_Eval x64 ISO Windows Server 2019 Datacenter Evaluation in Core mode
2016_x64_Standard_EN_Eval x64 ISO Windows Server 2016 Standard 64bit English Evaluation
2016_x64_Standard_Core_EN_Eval x64 ISO Windows Server 2016 Standard Core 64bit English Evaluation
2016_x64_Datacenter_EN_Eval x64 ISO Windows Server 2016 Datacenter 64bit English Evaluation
2016_x64_Datacenter_Core_EN_Eval x64 ISO Windows Server 2016 Datacenter Core 64bit English Evaluation
2016_x64_Standard_Nano_EN_Eval x64 ISO Windows Server 2016 Standard Nano 64bit English Evaluation
2016_x64_Datacenter_Nano_EN_Eval x64 ISO Windows Server 2016 Datacenter Nano 64bit English Evaluation
2012R2_x64_Standard_EN_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation
2012R2_x64_Standard_EN_V5_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5
2012R2_x64_Standard_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5.1
2012R2_x64_Standard_Core_EN_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation
2012R2_x64_Standard_Core_EN_V5_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5
2012R2_x64_Standard_Core_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5.1
2012R2_x64_Datacenter_EN_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation
2012R2_x64_Datacenter_EN_V5_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5
2012R2_x64_Datacenter_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5.1
2012R2_x64_Datacenter_Core_EN_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation
2012R2_x64_Datacenter_Core_EN_V5_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5
2012R2_x64_Datacenter_Core_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5.1
WIN81_x64_Enterprise_EN_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation
WIN81_x64_Enterprise_EN_V5_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation with WMF 5
WIN81_x64_Enterprise_EN_V5_1_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation with WMF 5.1
WIN81_x86_Enterprise_EN_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation
WIN81_x86_Enterprise_EN_V5_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation with WMF 5
WIN81_x86_Enterprise_EN_V5_1_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation with WMF 5.1
WIN10_x64_Enterprise_20H2_EN_Eval x64 ISO Windows 10 64bit Enterprise 2009 English Evaluation (20H2)
WIN10_x86_Enterprise_20H2_EN_Eval x86 ISO Windows 10 32bit Enterprise 2009 English Evaluation
WIN10_x64_Enterprise_LTSC_EN_Eval x64 ISO Windows 10 64bit Enterprise LTSC 2019 English Evaluation
WIN10_x86_Enterprise_LTSC_EN_Eval x86 ISO Windows 10 32bit Enterprise LTSC 2019 English Evaluation
#>
Lability_SwitchName = 'LabNet'
Lability_ProcessorCount = 1
Lability_MinimumMemory = 1GB
Lability_MaximumMemory = 16GB
SecureBoot = $false
Lability_RegisteredOwner = "Administrator"
Lability_RegisteredOrganization = "Company.pri"
Lability_Media = '2016_x64_Standard_Core_EN_Eval'

},

<# Available Roles for computers
Expand All @@ -136,7 +101,7 @@ WIN10_x86_Enterprise_LTSC_EN_Eval x86 ISO Windows 10 32bit Enterprise L
Lability_BootDelay = 60 # Number of seconds to delay before others
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
Lability_Media = '2016_x64_Standard_Core_EN_Eval'
Lability_MinimumMemory = 2GB
Lability_StartupMemory = 2GB
Lability_ProcessorCount = 2
CustomBootStrap = @'
# This must be set to handle larger .mof files
Expand Down Expand Up @@ -171,6 +136,7 @@ WIN10_x86_Enterprise_LTSC_EN_Eval x86 ISO Windows 10 32bit Enterprise L
IPAddress = '192.168.3.60'
Lability_BootOrder = 20
Lability_Media = '2019_x64_Standard_EN_Core_Eval'
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
Lability_ProcessorCount = 1
Lability_StartupMemory = 1GB
},
Expand All @@ -182,7 +148,7 @@ WIN10_x86_Enterprise_LTSC_EN_Eval x86 ISO Windows 10 32bit Enterprise L
Lability_ProcessorCount = 2
Lability_StartupMemory = 4GB
Lability_MinimumMemory = 4GB
Lability_Media = 'WIN10_x64_Enterprise_20H2_EN_Eval'
Lability_Media = 'WIN10_x64_Enterprise_21H2_EN_Eval'
Lability_BootOrder = 20
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
Lability_Resource = @()
Expand Down
2 changes: 1 addition & 1 deletion Configurations/Windows10/Instructions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This lab builds the following:

Computername : Win10Ent
Description : Windows 10 64bit Enterprise 2009 English Evaluation (20H2)
Description : Windows 10 64bit Enterprise 2109/21H2 English Evaluation
Role : {RSAT, RDP}
IPAddress : 192.168.3.101
MemoryGB : 2
Expand Down
41 changes: 2 additions & 39 deletions Configurations/Windows10/VMConfigurationData.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,49 +41,12 @@ demonstrations and would need to be modified for your environment.
SecureBoot = $false
Lability_Media = '2016_x64_Standard_Core_EN_Eval'

<#
Id Arch Media Description
-- ---- ----- -----------
2019_x64_Standard_EN_Eval x64 ISO Windows Server 2019 Standard 64bit English Evaluation with Desktop Experience
2019_x64_Standard_EN_Core_Eval x64 ISO Windows Server 2019 Standard 64bit English Evaluation
2019_x64_Datacenter_EN_Eval x64 ISO Windows Server 2019 Datacenter 64bit English Evaluation with Desktop Experience
2019_x64_Datacenter_EN_Core_Eval x64 ISO Windows Server 2019 Datacenter Evaluation in Core mode
2016_x64_Standard_EN_Eval x64 ISO Windows Server 2016 Standard 64bit English Evaluation
2016_x64_Standard_Core_EN_Eval x64 ISO Windows Server 2016 Standard Core 64bit English Evaluation
2016_x64_Datacenter_EN_Eval x64 ISO Windows Server 2016 Datacenter 64bit English Evaluation
2016_x64_Datacenter_Core_EN_Eval x64 ISO Windows Server 2016 Datacenter Core 64bit English Evaluation
2016_x64_Standard_Nano_EN_Eval x64 ISO Windows Server 2016 Standard Nano 64bit English Evaluation
2016_x64_Datacenter_Nano_EN_Eval x64 ISO Windows Server 2016 Datacenter Nano 64bit English Evaluation
2012R2_x64_Standard_EN_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation
2012R2_x64_Standard_EN_V5_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5
2012R2_x64_Standard_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5.1
2012R2_x64_Standard_Core_EN_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation
2012R2_x64_Standard_Core_EN_V5_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5
2012R2_x64_Standard_Core_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5.1
2012R2_x64_Datacenter_EN_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation
2012R2_x64_Datacenter_EN_V5_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5
2012R2_x64_Datacenter_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5.1
2012R2_x64_Datacenter_Core_EN_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation
2012R2_x64_Datacenter_Core_EN_V5_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5
2012R2_x64_Datacenter_Core_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5.1
WIN81_x64_Enterprise_EN_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation
WIN81_x64_Enterprise_EN_V5_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation with WMF 5
WIN81_x64_Enterprise_EN_V5_1_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation with WMF 5.1
WIN81_x86_Enterprise_EN_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation
WIN81_x86_Enterprise_EN_V5_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation with WMF 5
WIN81_x86_Enterprise_EN_V5_1_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation with WMF 5.1
WIN10_x64_Enterprise_20H2_EN_Eval x64 ISO Windows 10 64bit Enterprise 2009 English Evaluation
WIN10_x86_Enterprise_20H2_EN_Eval x86 ISO Windows 10 32bit Enterprise 2009 English Evaluation
WIN10_x64_Enterprise_LTSC_EN_Eval x64 ISO Windows 10 64bit Enterprise LTSC 2019 English Evaluation
WIN10_x86_Enterprise_LTSC_EN_Eval x86 ISO Windows 10 32bit Enterprise LTSC 2019 English Evaluation
#>
}

<# Available Roles for computers
DC = Domain Controller
DHCP = Dynamic Host Configuration Protocol
ADCS = Active Directory Certificate SErvices - plus autoenrollment GPO's and DSC and web server certs
ADCS = Active Directory Certificate Services - plus autoenrollment GPO's and DSC and web server certs
Web = Basic web server
RSAT = Remote Server Administration Tools for the client
RDP = enables RDP and opens up required firewall rules
Expand All @@ -96,7 +59,7 @@ demonstrations and would need to be modified for your environment.
Role = @('RSAT', 'RDP')
Lability_ProcessorCount = 2
Lability_MinimumMemory = 2GB
Lability_Media = 'WIN10_x64_Enterprise_20H2_EN_Eval'
Lability_Media = 'WIN10_x64_Enterprise_21H2_EN_Eval'
Lability_BootOrder = 20
Lability_timeZone = 'Central Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
Lability_Resource = @()
Expand Down
Binary file modified PSAutoLab.psd1
View file
Binary file not shown.
Binary file modified PSAutoLabManual.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Get-Module Pester -ListAvailable
If the _only_ result you get is for version `3.4.0`, then you must run:

```powershell
Install-Module pester -RequiredVersion 4.10.1 -Force -SkipPublisherCheck
Install-Module Oester -RequiredVersion 4.10.1 -Force -SkipPublisherCheck
```

Re-run the `Get-Module` to verify version `4.10.1` is installed. If you have newer versions installed, that will have no effect on this module. Once you have verified Pester version 4.10.1 you can install the PSAutoLab module.
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log for PSAutoLab

## 4.22.1

+ Updated `Windows10` and `PowerShellLab` configurations to use Windows 10 64bit Enterprise 2109/21H2 English Evaluation. They were missed in the previous update.
+ Fixed memory settings in `PowerShellLab` configuration for Win10 virtual machine.
+ Revised code formatting in the help PDF.

## 4.22.0

+ Updated Lability to version `0.21.1`.
Expand Down

0 comments on commit f2a7db4

Please sign in to comment.