diff --git a/Packer/answer_files/10/Autounattend.xml b/Packer/answer_files/10/Autounattend.xml
index 419d4eb..0d3ead9 100755
--- a/Packer/answer_files/10/Autounattend.xml
+++ b/Packer/answer_files/10/Autounattend.xml
@@ -200,15 +200,14 @@
Enable AutoLogon
-
+
false
@@ -244,6 +244,9 @@
true
+
+ true
+
diff --git a/Packer/answer_files/2012/Autounattend.xml b/Packer/answer_files/2012/Autounattend.xml
deleted file mode 100755
index efc2a28..0000000
--- a/Packer/answer_files/2012/Autounattend.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
-
-
-
-
- 1
- Primary
- true
-
-
-
-
- false
- NTFS
- C
- 1
- 1
-
-
-
- 0
- true
-
- OnError
-
-
- true
- Vagrant Administrator
- Vagrant Inc.
-
-
-
-
-
- Never
-
-
-
-
-
- 0
- 1
-
- OnError
- false
-
-
- /IMAGE/NAME
- Windows Server 2012 SERVERSTANDARD
-
-
-
-
-
-
-
- en-US
-
- de-DE
- de-DE
- en-US
- en-US
- de-DE
-
-
-
-
- false
-
-
-
-
-
-
- vagrant
- true
-
-
-
-
- vagrant
- true
-
- Vagrant User
- vagrant
- administrators
- vagrant
-
-
-
-
- true
- true
- Home
- 1
- true
- true
- true
- true
-
-
-
- vagrant
- true
-
- vagrant
- true
-
-
-
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 64 Bit
- 1
- true
-
-
- C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 32 Bit
- 2
- true
-
-
- cmd.exe /c winrm quickconfig -q
- winrm quickconfig -q
- 3
- true
-
-
- cmd.exe /c winrm quickconfig -transport:http
- winrm quickconfig -transport:http
- 4
- true
-
-
- cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}
- Win RM MaxTimoutms
- 5
- true
-
-
- cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}
- Win RM MaxMemoryPerShellMB
- 6
- true
-
-
- cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}
- Win RM AllowUnencrypted
- 7
- true
-
-
- cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}
- Win RM auth Basic
- 8
- true
-
-
- cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}
- Win RM client auth Basic
- 9
- true
-
-
- cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}
- Win RM listener Address/Port
- 10
- true
-
-
- cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes
- Win RM adv firewall enable
- 11
- true
-
-
- cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"
- Win RM port open
- 12
- true
-
-
- cmd.exe /c net stop winrm
- Stop Win RM Service
- 13
- true
-
-
- cmd.exe /c sc config winrm start= auto
- Win RM Autostart
- 14
- true
-
-
- cmd.exe /c net start winrm
- Start Win RM Service
- 15
- true
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v HideFileExt /t REG_DWORD /d 0 /f
- 16
- Show file extensions in Explorer
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\Console /v QuickEdit /t REG_DWORD /d 1 /f
- 17
- Enable QuickEdit mode
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v Start_ShowRun /t REG_DWORD /d 1 /f
- 18
- Show Run command in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v StartMenuAdminTools /t REG_DWORD /d 1 /f
- 19
- Show Administrative Tools in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateFileSizePercent /t REG_DWORD /d 0 /f
- 20
- Zero Hibernation File
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateEnabled /t REG_DWORD /d 0 /f
- 21
- Disable Hibernation Mode
-
-
- cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE
- 22
- Disable password expiration for vagrant user
-
-
-
- cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\openssh.ps1 -AutoStart
- Install OpenSSH
- 99
- true
-
-
-
-
-
-
- false
-
-
-
-
-
- false
-
-
- vagrant-2012
- W. Europe Standard Time
-
-
-
- true
-
-
-
- false
- false
-
-
- true
-
-
- true
-
-
-
-
diff --git a/Packer/answer_files/2012_r2/Autounattend.xml b/Packer/answer_files/2012_r2/Autounattend.xml
deleted file mode 100755
index be7d920..0000000
--- a/Packer/answer_files/2012_r2/Autounattend.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-
-
-
- en-US
-
- en-US
- en-US
- en-US
- en-US
- en-US
-
-
-
-
-
-
- Primary
- 1
- 350
-
-
- 2
- Primary
- true
-
-
-
-
- true
- NTFS
-
- 1
- 1
-
-
- NTFS
-
- C
- 2
- 2
-
-
- 0
- true
-
-
-
-
-
-
- /IMAGE/NAME
- Windows Server 2012 R2 SERVERSTANDARD
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
-
- OnError
-
- true
- Vagrant
- Vagrant
-
-
-
-
-
-
- false
-
- vagrant-2012-r2
- W. Europe Standard Time
-
-
-
- true
-
-
- false
- false
-
-
- true
-
-
- true
-
-
-
-
- 1
- Set Execution Policy 64 Bit
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
-
-
- 2
- Set Execution Policy 32 Bit
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
-
-
- 3
- Disable WinRM
- C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\disable-winrm.ps1
-
-
-
-
-
-
-
-
- vagrant
- true
-
- true
- vagrant
-
-
-
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 64 Bit
- 1
- true
-
-
- C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 32 Bit
- 2
- true
-
-
- C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\disable-winrm.ps1
- Disable WinRM
- 3
- true
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v HideFileExt /t REG_DWORD /d 0 /f
- 4
- Show file extensions in Explorer
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\Console /v QuickEdit /t REG_DWORD /d 1 /f
- 5
- Enable QuickEdit mode
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v Start_ShowRun /t REG_DWORD /d 1 /f
- 6
- Show Run command in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v StartMenuAdminTools /t REG_DWORD /d 1 /f
- 7
- Show Administrative Tools in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateFileSizePercent /t REG_DWORD /d 0 /f
- 8
- Zero Hibernation File
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateEnabled /t REG_DWORD /d 0 /f
- 9
- Disable Hibernation Mode
-
-
- cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE
- 10
- Disable password expiration for vagrant user
-
-
-
-
-
-
- cmd.exe /c a:\microsoft-updates.bat
- 98
- Enable Microsoft Updates
-
-
- cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\win-updates.ps1
- Install Windows Updates
- 100
- true
-
-
-
-
- true
- true
- true
- true
- true
- Home
- 1
-
-
-
- vagrant
- true
-
-
-
-
- vagrant
- true
-
- administrators
- Vagrant
- vagrant
- Vagrant User
-
-
-
-
-
-
-
-
- false
-
-
-
-
diff --git a/Packer/answer_files/2012_r2_core/Autounattend.xml b/Packer/answer_files/2012_r2_core/Autounattend.xml
deleted file mode 100755
index 4860c85..0000000
--- a/Packer/answer_files/2012_r2_core/Autounattend.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-
-
-
- en-US
-
- de-DE
- de-DE
- en-US
- en-US
- de-DE
-
-
-
-
-
-
- Primary
- 1
- 350
-
-
- 2
- Primary
- true
-
-
-
-
- true
- NTFS
-
- 1
- 1
-
-
- NTFS
-
- C
- 2
- 2
-
-
- 0
- true
-
-
-
-
-
-
- /IMAGE/NAME
- Windows Server 2012 R2 SERVERSTANDARDCORE
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
-
- OnError
-
- true
- Vagrant
- Vagrant
-
-
-
-
-
-
- false
-
- vagrant-2012-r2
- W. Europe Standard Time
-
-
-
- true
-
-
- false
- false
-
-
- true
-
-
- true
-
-
-
-
- 1
- Set Execution Policy 64 Bit
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
-
-
- 2
- Set Execution Policy 32 Bit
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
-
-
- 3
- Disable WinRM
- C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\disable-winrm.ps1
-
-
-
-
-
-
-
-
- vagrant
- true
-
- true
- vagrant
-
-
-
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 64 Bit
- 1
- true
-
-
- C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 32 Bit
- 2
- true
-
-
- C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\disable-winrm.ps1
- Disable WinRM
- 3
- true
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v HideFileExt /t REG_DWORD /d 0 /f
- 4
- Show file extensions in Explorer
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\Console /v QuickEdit /t REG_DWORD /d 1 /f
- 5
- Enable QuickEdit mode
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v Start_ShowRun /t REG_DWORD /d 1 /f
- 6
- Show Run command in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v StartMenuAdminTools /t REG_DWORD /d 1 /f
- 7
- Show Administrative Tools in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateFileSizePercent /t REG_DWORD /d 0 /f
- 8
- Zero Hibernation File
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateEnabled /t REG_DWORD /d 0 /f
- 9
- Disable Hibernation Mode
-
-
- cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE
- 10
- Disable password expiration for vagrant user
-
-
-
-
-
-
- cmd.exe /c a:\microsoft-updates.bat
- 98
- Enable Microsoft Updates
-
-
- cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\win-updates.ps1
- Install Windows Updates
- 100
- true
-
-
-
-
- true
- true
- true
- true
- true
- Home
- 1
-
-
-
- vagrant
- true
-
-
-
-
- vagrant
- true
-
- administrators
- Vagrant
- vagrant
- Vagrant User
-
-
-
-
-
-
-
-
- false
-
-
-
-
diff --git a/Packer/answer_files/2012_r2_hyperv/Autounattend.xml b/Packer/answer_files/2012_r2_hyperv/Autounattend.xml
deleted file mode 100755
index dbb0e2b..0000000
--- a/Packer/answer_files/2012_r2_hyperv/Autounattend.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-
-
-
- en-US
-
- en-US
- en-US
- en-US
- en-US
- en-US
-
-
-
-
-
-
- Primary
- 1
- 350
-
-
- 2
- Primary
- true
-
-
-
-
- true
- NTFS
-
- 1
- 1
-
-
- NTFS
-
- C
- 2
- 2
-
-
- 0
- true
-
-
-
-
-
-
- /IMAGE/NAME
- Windows Server 2012 R2 SERVERHYPERCORE
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
-
- OnError
-
- true
- Vagrant
- Vagrant
-
-
-
-
-
-
- false
-
- vagrant-2012-r2
- Pacific Standard Time
-
-
-
- true
-
-
- false
- false
-
-
- true
-
-
- true
-
-
-
-
-
-
- vagrant
- true
-
- true
- vagrant
-
-
-
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 64 Bit
- 1
- true
-
-
- C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 32 Bit
- 2
- true
-
-
- cmd.exe /c winrm quickconfig -q
- winrm quickconfig -q
- 3
- true
-
-
- cmd.exe /c winrm quickconfig -transport:http
- winrm quickconfig -transport:http
- 4
- true
-
-
- cmd.exe /c winrm set winrm/config @{MaxTimeoutms="1800000"}
- Win RM MaxTimoutms
- 5
- true
-
-
- cmd.exe /c winrm set winrm/config/winrs @{MaxMemoryPerShellMB="800"}
- Win RM MaxMemoryPerShellMB
- 6
- true
-
-
- cmd.exe /c winrm set winrm/config/service @{AllowUnencrypted="true"}
- Win RM AllowUnencrypted
- 7
- true
-
-
- cmd.exe /c winrm set winrm/config/service/auth @{Basic="true"}
- Win RM auth Basic
- 8
- true
-
-
- cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}
- Win RM client auth Basic
- 9
- true
-
-
- cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}
- Win RM listener Address/Port
- 10
- true
-
-
- cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes
- Win RM adv firewall enable
- 11
- true
-
-
- cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"
- Win RM port open
- 12
- true
-
-
- cmd.exe /c net stop winrm
- Stop Win RM Service
- 13
- true
-
-
- cmd.exe /c sc config winrm start= auto
- Win RM Autostart
- 14
- true
-
-
- cmd.exe /c net start winrm
- Start Win RM Service
- 15
- true
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v HideFileExt /t REG_DWORD /d 0 /f
- 16
- Show file extensions in Explorer
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\Console /v QuickEdit /t REG_DWORD /d 1 /f
- 17
- Enable QuickEdit mode
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v Start_ShowRun /t REG_DWORD /d 1 /f
- 18
- Show Run command in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v StartMenuAdminTools /t REG_DWORD /d 1 /f
- 19
- Show Administrative Tools in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateFileSizePercent /t REG_DWORD /d 0 /f
- 20
- Zero Hibernation File
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateEnabled /t REG_DWORD /d 0 /f
- 21
- Disable Hibernation Mode
-
-
- cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE
- 22
- Disable password expiration for vagrant user
-
-
-
-
-
-
- cmd.exe /c a:\microsoft-updates.bat
- 98
- Enable Microsoft Updates
-
-
- cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\win-updates.ps1
- Install Windows Updates
- 100
- true
-
-
-
-
- true
- true
- true
- true
- true
- Home
- 1
-
-
-
- vagrant
- true
-
-
-
-
- vagrant
- true
-
- administrators
- Vagrant
- vagrant
- Vagrant User
-
-
-
-
-
-
-
-
- false
-
-
-
-
diff --git a/Packer/answer_files/2016/Autounattend.xml b/Packer/answer_files/2016/Autounattend.xml
index 1379bcc..0a415ae 100755
--- a/Packer/answer_files/2016/Autounattend.xml
+++ b/Packer/answer_files/2016/Autounattend.xml
@@ -50,7 +50,7 @@
- /IMAGE/NAME
+ /IMAGE/NAME
Windows Server 2016 SERVERSTANDARD
@@ -181,15 +181,14 @@
Disable password expiration for vagrant user
-
+
diff --git a/Packer/answer_files/2016/Autounattend_sysprep.xml b/Packer/answer_files/2016/Autounattend_sysprep.xml
deleted file mode 100755
index cb538aa..0000000
--- a/Packer/answer_files/2016/Autounattend_sysprep.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
- 0
-
-
- false
- false
-
-
-
-
- en-US
- en-US
- en-US
- en-US
-
-
-
- true
- 1
- Home
- true
-
- UTC
-
-
- vagrant
- true
-
-
-
-
- vagrant
- true
-
- administrators
- Vagrant
- vagrant
- Vagrant User
-
-
-
-
-
-
-
-
diff --git a/Packer/answer_files/2016_core/Autounattend.xml b/Packer/answer_files/2016_core/Autounattend.xml
deleted file mode 100755
index 929d76b..0000000
--- a/Packer/answer_files/2016_core/Autounattend.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
- en-US
-
- en-US
- en-US
- en-US
- en-US
- en-US
-
-
-
-
-
-
- Primary
- 1
- 350
-
-
- 2
- Primary
- true
-
-
-
-
- true
- NTFS
-
- 1
- 1
-
-
- NTFS
-
- C
- 2
- 2
-
-
- 0
- true
-
-
-
-
-
-
- /IMAGE/NAME
- Windows Server 2016 SERVERSTANDARDCORE
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
-
- OnError
-
- true
- Vagrant
- Vagrant
-
-
-
-
-
-
- false
-
- vagrant-2016
- Pacific Standard Time
-
-
-
- true
-
-
- false
- false
-
-
- true
-
-
- true
-
-
-
-
-
-
- vagrant
- true
-
- true
- vagrant
-
-
-
- cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 64 Bit
- 1
- true
-
-
- C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"
- Set Execution Policy 32 Bit
- 2
- true
-
-
- C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\disable-winrm.ps1
- Disable WinRM
- 3
- true
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v HideFileExt /t REG_DWORD /d 0 /f
- 4
- Show file extensions in Explorer
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\Console /v QuickEdit /t REG_DWORD /d 1 /f
- 5
- Enable QuickEdit mode
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v Start_ShowRun /t REG_DWORD /d 1 /f
- 6
- Show Run command in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ /v StartMenuAdminTools /t REG_DWORD /d 1 /f
- 7
- Show Administrative Tools in Start Menu
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateFileSizePercent /t REG_DWORD /d 0 /f
- 8
- Zero Hibernation File
-
-
- %SystemRoot%\System32\reg.exe ADD HKLM\SYSTEM\CurrentControlSet\Control\Power\ /v HibernateEnabled /t REG_DWORD /d 0 /f
- 9
- Disable Hibernation Mode
-
-
- cmd.exe /c wmic useraccount where "name='vagrant'" set PasswordExpires=FALSE
- 10
- Disable password expiration for vagrant user
-
-
-
-
-
-
- cmd.exe /c a:\microsoft-updates.bat
- 98
- Enable Microsoft Updates
-
-
- cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\disable-screensaver.ps1
- Disable Screensaver
- 99
- true
-
-
- cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\win-updates.ps1
- Install Windows Updates
- 100
- true
-
-
-
-
- true
- true
- true
- true
- true
- Home
- 1
-
-
-
- vagrant
- true
-
-
-
-
- vagrant
- true
-
- administrators
- Vagrant
- vagrant
- Vagrant User
-
-
-
-
-
-
-
-
- false
-
-
-
-
diff --git a/Packer/scripts/MakeWindows10GreatAgain.ps1 b/Packer/scripts/MakeWindows10GreatAgain.ps1
deleted file mode 100755
index 67b4cc2..0000000
--- a/Packer/scripts/MakeWindows10GreatAgain.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-# Import the registry keys
-Write-Host "Making Windows 10 Great again"
-Write-Host "Importing registry keys..."
-regedit /s a:\MakeWindows10GreatAgain.reg
-
-# Remove OneDrive from the System
-Write-Host "Removing OneDrive..."
-$onedrive = Get-Process onedrive -ErrorAction SilentlyContinue
-if ($onedrive) {
- taskkill /f /im OneDrive.exe
-}
-c:\Windows\SysWOW64\OneDriveSetup.exe /uninstall
-
-Write-Host "Running Update-Help..."
-Update-Help -Force -ErrorAction SilentlyContinue
-
-Write-Host "Removing Microsoft Store, Mail, and Edge shortcuts from the taskbar..."
-$appname = "Microsoft Edge"
-((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
-$appname = "Microsoft Store"
-((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
-$appname = "Mail"
-((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
diff --git a/Packer/scripts/MakeWindows10GreatAgain.reg b/Packer/scripts/MakeWindows10GreatAgain.reg
deleted file mode 100755
index e8ed2d4..0000000
--- a/Packer/scripts/MakeWindows10GreatAgain.reg
+++ /dev/null
@@ -1,49 +0,0 @@
-Windows Registry Editor Version 5.00
-
-# Disable Cortana (Windows search still remains)
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search]
-"AllowCortana"=dword:00000000
-
-# Disable Notification Center
-[HKEY_CURRENT_USER\SOFTWARE\Policies\Microsoft\Windows\Explorer]
-"DisableNotificationCenter"=dword:00000001
-
-# Don't reboot when users are logged in for Windows updates
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]
-"NoAutoRebootWithLoggedOnUsers"=dword:00000001
-
-# Disable Microsoft.com accounts
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]
-"NoConnectedUser"=dword:00000003
-
-# Show all file extensions
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-"HideFileExt"=dword:00000000
-
-# Set explorer to open to "This PC" for new windows
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-"LaunchTo"=dword:00000001
-
-# Show hidden files (not including OS files)
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-"Hidden"=dword:00000001
-
-# Show "This PC" on Desktop
-# Created by: Shawn Brink
-# http://www.tenforums.com
-[HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel]
-"{20D04FE0-3AEA-1069-A2D8-08002B30309D}"=dword:00000000
-
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel]
-"{20D04FE0-3AEA-1069-A2D8-08002B30309D}"=dword:00000000
-
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu]
-"{20D04FE0-3AEA-1069-A2D8-08002B30309D}"=dword:00000000
-
-# Enable Developer Mode (prerequisite for Linux subsystem)
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock]
-"AllowDevelopmentWithoutDevLicense"=dword:00000001
-
-# Disable Microsoft People icon from taskbar
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People]
-"PeopleBand"=dword:00000000
diff --git a/Packer/scripts/sysprep.bat b/Packer/scripts/sysprep.bat
index 4f2e49b..b660e54 100755
--- a/Packer/scripts/sysprep.bat
+++ b/Packer/scripts/sysprep.bat
@@ -1,2 +1,4 @@
net stop tiledatamodelsvc
-c:\windows\system32\sysprep\sysprep.exe /generalize /oobe /shutdown /unattend:a:\unattend.xml
+echo "I am shutting down"
+c:\windows\system32\sysprep\sysprep.exe /generalize /mode:vm /oobe /unattend:a:\unattend.xml
+shutdown /s
diff --git a/Packer/windows_10.json b/Packer/windows_10.json
index 5360cfe..524fd07 100644
--- a/Packer/windows_10.json
+++ b/Packer/windows_10.json
@@ -1,37 +1,5 @@
{
"builders": [
- {
- "type": "hyperv-iso",
- "vm_name":"windows_10",
- "iso_url": "{{user `iso_url`}}",
- "iso_checksum_type": "{{user `iso_checksum_type`}}",
- "iso_checksum": "{{user `iso_checksum`}}",
- "boot_wait": "6m",
- "communicator":"winrm",
- "winrm_username": "vagrant",
- "winrm_password": "vagrant",
- "winrm_timeout" : "4h",
- "ram_size": "2048",
- "cpu": "2",
- "switch_name": "{{user `switch_name`}}",
- "guest_additions_mode": "none",
- "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
- "disk_size": "{{user `disk_size`}}",
- "floppy_files": [
- "{{user `autounattend`}}",
- "./floppy/WindowsPowershell.lnk",
- "./floppy/PinTo10.exe",
- "./scripts/fixnetwork.ps1",
- "./scripts/MakeWindows10GreatAgain.ps1",
- "./scripts/MakeWindows10GreatAgain.reg",
- "./scripts/rearm-windows.ps1",
- "./scripts/disable-screensaver.ps1",
- "./scripts/disable-winrm.ps1",
- "./scripts/enable-winrm.ps1",
- "./scripts/microsoft-updates.bat",
- "./scripts/win-updates.ps1"
- ]
- },
{
"type": "vmware-iso",
"vm_name":"windows_10",
@@ -45,7 +13,8 @@
"winrm_username": "vagrant",
"winrm_password": "vagrant",
"winrm_timeout": "4h",
- "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+ "shutdown_timeout": "2h",
+ "shutdown_command": "a:/sysprep.bat",
"guest_os_type": "windows9-64",
"disk_size": "{{user `disk_size`}}",
"vnc_port_min": 5900,
@@ -56,14 +25,14 @@
"./floppy/WindowsPowershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/fixnetwork.ps1",
- "./scripts/MakeWindows10GreatAgain.ps1",
- "./scripts/MakeWindows10GreatAgain.reg",
"./scripts/rearm-windows.ps1",
"./scripts/disable-screensaver.ps1",
"./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat",
- "./scripts/win-updates.ps1"
+ "./scripts/win-updates.ps1",
+ "./scripts/unattend.xml",
+ "./scripts/sysprep.bat"
],
"vmx_data": {
"RemoteDisplay.vnc.enabled": "false",
@@ -86,7 +55,8 @@
"winrm_username": "vagrant",
"winrm_password": "vagrant",
"winrm_timeout": "4h",
- "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
+ "shutdown_timeout": "2h",
+ "shutdown_command": "a:/sysprep.bat",
"guest_os_type": "Windows81_64",
"guest_additions_mode": "disable",
"disk_size": "{{user `disk_size`}}",
@@ -95,15 +65,14 @@
"./floppy/WindowsPowershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/fixnetwork.ps1",
- "./scripts/MakeWindows10GreatAgain.ps1",
- "./scripts/MakeWindows10GreatAgain.reg",
"./scripts/rearm-windows.ps1",
"./scripts/disable-screensaver.ps1",
"./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat",
"./scripts/win-updates.ps1",
- "./scripts/oracle-cert.cer"
+ "./scripts/unattend.xml",
+ "./scripts/sysprep.bat"
],
"vboxmanage": [
[
@@ -134,9 +103,7 @@
{
"type": "powershell",
"scripts": [
- "./scripts/debloat-windows.ps1",
- "./scripts/rearm-windows.ps1",
- "./scripts/MakeWindows10GreatAgain.ps1"
+ "./scripts/debloat-windows.ps1"
]
},
{
@@ -157,7 +124,7 @@
"./scripts/pin-powershell.bat",
"./scripts/compile-dotnet-assemblies.bat",
"./scripts/set-winrm-automatic.bat",
- "./scripts/compact.bat"
+ "./scripts/dis-updates.bat"
]
}
],
@@ -170,9 +137,9 @@
}
],
"variables": {
- "iso_checksum": "27e4feb9102f7f2b21ebdb364587902a70842fb550204019d1a14b120918e455",
+ "iso_checksum": "ab4862ba7d1644c27f27516d24cb21e6b39234eb3301e5f1fb365a78b22f79b3",
"iso_checksum_type": "sha256",
- "iso_url": "https://software-download.microsoft.com/download/pr/17134.1.180410-1804.rs4_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
+ "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
"autounattend": "./answer_files/10/Autounattend.xml",
"disk_size": "61440"
}
diff --git a/Packer/windows_2016.json b/Packer/windows_2016.json
index 820b2a7..967f465 100644
--- a/Packer/windows_2016.json
+++ b/Packer/windows_2016.json
@@ -1,36 +1,5 @@
{
"builders": [
- {
- "vm_name":"WindowsServer2016",
- "type": "hyperv-iso",
- "disk_size": 41440,
- "boot_wait": "0s",
- "guest_additions_mode":"disable",
- "iso_url": "{{user `iso_url`}}",
- "iso_checksum_type": "{{user `iso_checksum_type`}}",
- "iso_checksum": "{{user `iso_checksum`}}",
- "floppy_files": [
- "{{user `autounattend`}}",
- "./floppy/WindowsPowershell.lnk",
- "./floppy/PinTo10.exe",
- "./scripts/unattend.xml",
- "./scripts/sysprep.bat",
- "./scripts/disable-screensaver.ps1",
- "./scripts/disable-winrm.ps1",
- "./scripts/enable-winrm.ps1",
- "./scripts/microsoft-updates.bat",
- "./scripts/win-updates.ps1"
- ],
- "communicator":"winrm",
- "winrm_username": "vagrant",
- "winrm_password": "vagrant",
- "winrm_timeout" : "2h",
- "shutdown_command": "a:/sysprep.bat",
- "ram_size": 2048,
- "cpu": 2,
- "switch_name":"{{user `hyperv_switchname`}}",
- "enable_secure_boot":true
- },
{
"vm_name":"WindowsServer2016",
"type": "vmware-iso",
@@ -143,11 +112,6 @@
"./scripts/uac-enable.bat",
"./scripts/compact.bat"
]
- },
- {
- "type": "file",
- "source": "./answer_files/2016/Autounattend_sysprep.xml",
- "destination": "c:/Windows/Temp/Autounattend_sysprep.xml"
}
],
"post-processors": [
@@ -162,7 +126,6 @@
"iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
"iso_checksum_type": "md5",
"iso_checksum": "70721288BBCDFE3239D8F8C0FAE55F1F",
- "autounattend": "./answer_files/2016/Autounattend.xml",
- "hyperv_switchname": "{{env `hyperv_switchname`}}"
+ "autounattend": "./answer_files/2016/Autounattend.xml"
}
}
diff --git a/Vagrant/Vagrantfile b/Vagrant/Vagrantfile
index e8329f5..57bf59b 100644
--- a/Vagrant/Vagrantfile
+++ b/Vagrant/Vagrantfile
@@ -3,7 +3,7 @@ Vagrant.configure("2") do |config|
config.vm.define "logger" do |cfg|
cfg.vm.box = "bento/ubuntu-16.04"
cfg.vm.hostname = "logger"
- config.vm.provision :shell, path: "bootstrap.sh"
+ cfg.vm.provision :shell, path: "bootstrap.sh"
cfg.vm.network :private_network, ip: "192.168.38.105", gateway: "192.168.38.1", dns: "8.8.8.8"
cfg.vm.provider "vmware_desktop" do |v, override|
@@ -26,7 +26,7 @@ Vagrant.configure("2") do |config|
end
config.vm.define "dc" do |cfg|
- cfg.vm.box = "detectionlab/win2016"
+ cfg.vm.box = "../Packer/windows_2016_vmware.box"
cfg.vm.hostname = "dc"
cfg.vm.boot_timeout = 600
cfg.winrm.transport = :plaintext
@@ -54,6 +54,7 @@ Vagrant.configure("2") do |config|
cfg.vm.provision "shell", path: "scripts/configure-powershelllogging.ps1", privileged: false
cfg.vm.provision "shell", path: "scripts/configure-AuditingPolicyGPOs.ps1", privileged: false
cfg.vm.provision "shell", path: "scripts/configure-rdp-user-gpo.ps1", privileged: false
+ cfg.vm.provision "shell", path: "scripts/configure-disable-windows-defender-gpo.ps1", privileged: false
cfg.vm.provision "shell", path: "scripts/install-autorunstowineventlog.ps1", privileged: false
cfg.vm.provision "shell", inline: 'wevtutil el | Select-String -notmatch "Microsoft-Windows-LiveId" | Foreach-Object {wevtutil cl "$_"}', privileged: false
cfg.vm.provision "shell", inline: "Set-SmbServerConfiguration -AuditSmb1Access $true -Force", privileged: false
@@ -79,7 +80,7 @@ Vagrant.configure("2") do |config|
end
config.vm.define "wef" do |cfg|
- cfg.vm.box = "detectionlab/win2016"
+ cfg.vm.box = "../Packer/windows_2016_vmware.box"
cfg.vm.hostname = "wef"
cfg.vm.boot_timeout = 600
cfg.vm.communicator = "winrm"
@@ -130,12 +131,12 @@ Vagrant.configure("2") do |config|
end
config.vm.define "win10" do |cfg|
- cfg.vm.box = "detectionlab/win10"
+ cfg.vm.box = "../Packer/windows_10_vmware.box"
cfg.vm.hostname = "win10"
- cfg.vm.boot_timeout = 600
+ cfg.vm.boot_timeout = 1200
cfg.vm.communicator = "winrm"
cfg.winrm.basic_auth_only = true
- cfg.winrm.timeout = 300
+ cfg.winrm.timeout = 1200
cfg.winrm.retry_limit = 20
cfg.vm.network :private_network, ip: "192.168.38.104", gateway: "192.168.38.1", dns: "192.168.38.102"
diff --git a/Vagrant/resources/GPO/disable_windows_defender/manifest.xml b/Vagrant/resources/GPO/disable_windows_defender/manifest.xml
new file mode 100755
index 0000000..b7030ee
--- /dev/null
+++ b/Vagrant/resources/GPO/disable_windows_defender/manifest.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/Backup.xml b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/Backup.xml
new file mode 100755
index 0000000..d5b772c
--- /dev/null
+++ b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/Backup.xml
@@ -0,0 +1,18 @@
+
+ 01 00 04 9c 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 04 00 ec 00 08 00 00 00 05 02 28 00 00 01 00 00 01 00 00 00 8f fd ac ed b3 ff d1 11 b4 1d 00 a0 c9 68 f9 39 01 01 00 00 00 00 00 05 0b 00 00 00 00 00 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 ab 78 eb 1f 41 dd b6 6b 45 1f 31 0d e8 03 00 00 00 02 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 ab 78 eb 1f 41 dd b6 6b 45 1f 31 0d 00 02 00 00 00 02 24 00 ff 00 0f 00 01 05 00 00 00 00 00 05 15 00 00 00 ab 78 eb 1f 41 dd b6 6b 45 1f 31 0d 07 02 00 00 00 02 14 00 94 00 02 00 01 01 00 00 00 00 00 05 09 00 00 00 00 02 14 00 94 00 02 00 01 01 00 00 00 00 00 05 0b 00 00 00 00 02 14 00 ff 00 0f 00 01 01 00 00 00 00 00 05 12 00 00 00 00 0a 14 00 ff 00 0f 00 01 01 00 00 00 00 00 03 00 00 00 00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/DomainSysvol/GPO/Machine/comment.cmtx b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/DomainSysvol/GPO/Machine/comment.cmtx
new file mode 100755
index 0000000..275f4b9
--- /dev/null
+++ b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/DomainSysvol/GPO/Machine/comment.cmtx
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/DomainSysvol/GPO/Machine/registry.pol b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/DomainSysvol/GPO/Machine/registry.pol
new file mode 100755
index 0000000..08a48aa
Binary files /dev/null and b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/DomainSysvol/GPO/Machine/registry.pol differ
diff --git a/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/bkupInfo.xml b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/bkupInfo.xml
new file mode 100755
index 0000000..0e7c0a5
--- /dev/null
+++ b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/bkupInfo.xml
@@ -0,0 +1 @@
+
diff --git a/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/gpreport.xml b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/gpreport.xml
new file mode 100755
index 0000000..9a2740a
Binary files /dev/null and b/Vagrant/resources/GPO/disable_windows_defender/{A1B5F23F-DC23-4225-98D0-22FD4EAF312C}/gpreport.xml differ
diff --git a/Vagrant/resources/windows/shutup10.cfg b/Vagrant/resources/windows/shutup10.cfg
index 80eabea..599a4a9 100755
--- a/Vagrant/resources/windows/shutup10.cfg
+++ b/Vagrant/resources/windows/shutup10.cfg
@@ -1,18 +1,18 @@
############################################################################
-# This file was created with O&O ShutUp10 and can be imported onto another computer.
+# This file was created with O&O ShutUp10 and can be imported onto another computer.
#
# Download the application at https://www.oo-software.com/en/shutup10
-# You can then import the file from within the program.
+# You can then import the file from within the program.
#
# Alternatively you can import it automatically over a command line. Simply use
-# the following parameter:
+# the following parameter:
# ooshutup10.exe
-#
-# Selecting the Option /quiet ends the app right after the import and the user does not
+#
+# Selecting the Option /quiet ends the app right after the import and the user does not
# get any feedback about the import.
#
# We are always happy to answer any questions you may have!
-# (c) 2015-2018 O&O Software GmbH, Berlin. https://www.oo-software.com/
+# Copyright © O&O Software GmbH https://www.oo-software.com/
############################################################################
P001 +
@@ -58,6 +58,7 @@ S010 +
E001 +
E002 +
E003 +
+E008 +
E007 +
E010 +
E009 +
@@ -125,4 +126,4 @@ M012 +
M013 +
M014 +
M015 +
-N001 +
+N001 -
diff --git a/Vagrant/scripts/MakeWindows10GreatAgain.ps1 b/Vagrant/scripts/MakeWindows10GreatAgain.ps1
index a1a9508..870ac27 100644
--- a/Vagrant/scripts/MakeWindows10GreatAgain.ps1
+++ b/Vagrant/scripts/MakeWindows10GreatAgain.ps1
@@ -11,16 +11,14 @@ if ($onedrive) {
}
c:\Windows\SysWOW64\OneDriveSetup.exe /uninstall
-Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Running Update-Help..."
-Update-Help -Force -ErrorAction SilentlyContinue
-
-Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Removing Microsoft Store and Edge shortcuts from the taskbar..."
-$appname = "Microsoft Edge"
-((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
-$appname = "Microsoft Store"
-((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
-$appname = "Mail"
-((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
+# Fix in 1903
+#Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Removing Microsoft Store and Edge shortcuts from the taskbar..."
+#$appname = "Microsoft Edge"
+#((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
+#$appname = "Microsoft Store"
+#((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
+#$appname = "Mail"
+#((New-Object -Com Shell.Application).NameSpace('shell:::{4234d49b-0245-4df3-b780-3893943456e1}').Items() | ?{$_.Name -eq $appname}).Verbs() | ?{$_.Name.replace('&','') -match 'Unpin from taskbar'} | %{$_.DoIt(); $exec = $true}
Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Disabling automatic screen turnoff in order to prevent screen locking..."
powercfg -change -monitor-timeout-ac 0
@@ -33,10 +31,11 @@ Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Downloading ShutUp10..."
$shutUp10DownloadUrl = "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe"
$shutUp10RepoPath = "C:\Users\vagrant\AppData\Local\Temp\OOSU10.exe"
if (-not (Test-Path $shutUp10RepoPath)) {
+ Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Installing ShutUp10 and disabling Windows Defender"
Invoke-WebRequest -Uri "$shutUp10DownloadUrl" -OutFile $shutUp10RepoPath
. $shutUp10RepoPath c:\vagrant\resources\windows\shutup10.cfg /quiet /force
} else {
- Write-Host "ShutUp10 was already installed. Moving On."
+ Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) ShutUp10 was already installed. Moving On."
}
# Remove the Edge shortcut from the Desktop
diff --git a/Vagrant/scripts/configure-disable-windows-defender-gpo.ps1 b/Vagrant/scripts/configure-disable-windows-defender-gpo.ps1
new file mode 100644
index 0000000..bcd8348
--- /dev/null
+++ b/Vagrant/scripts/configure-disable-windows-defender-gpo.ps1
@@ -0,0 +1,29 @@
+# Purpose: Install the GPO that disables Windows Defender
+Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Importing the GPO to disable Windows Defender..."
+Import-GPO -BackupGpoName 'Disable Windows Defender' -Path "c:\vagrant\resources\GPO\disable_windows_defender" -TargetName 'Disable Windows Defender' -CreateIfNeeded
+
+$OU = "ou=Workstations,dc=windomain,dc=local"
+$gPLinks = $null
+$gPLinks = Get-ADOrganizationalUnit -Identity $OU -Properties name,distinguishedName, gPLink, gPOptions
+$GPO = Get-GPO -Name 'Disable Windows Defender'
+If ($gPLinks.LinkedGroupPolicyObjects -notcontains $gpo.path)
+{
+ New-GPLink -Name 'Disable Windows Defender' -Target $OU -Enforced yes
+}
+else
+{
+ Write-Host "Disable Windows Defender GPO was already linked at $OU. Moving On."
+}
+$OU = "ou=Servers,dc=windomain,dc=local"
+$gPLinks = $null
+$gPLinks = Get-ADOrganizationalUnit -Identity $OU -Properties name,distinguishedName, gPLink, gPOptions
+$GPO = Get-GPO -Name 'Disable Windows Defender'
+If ($gPLinks.LinkedGroupPolicyObjects -notcontains $gpo.path)
+{
+ New-GPLink -Name 'Disable Windows Defender' -Target $OU -Enforced yes
+}
+else
+{
+ Write-Host "Disable Windows Defender GPO was already linked at $OU. Moving On."
+}
+gpupdate /force
diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh
index 9b39870..8b33a47 100755
--- a/ci/build_machine_bootstrap.sh
+++ b/ci/build_machine_bootstrap.sh
@@ -75,8 +75,8 @@ ufw --force enable
echo "[$(date +%H:%M:%S)]: Installing Vagrant..."
mkdir /opt/vagrant
cd /opt/vagrant || exit 1
-wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb
-dpkg -i vagrant_2.2.4_x86_64.deb
+wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.deb
+dpkg -i vagrant_2.2.5_x86_64.deb
echo "[$(date +%H:%M:%S)]: Installing vagrant-reload plugin..."
vagrant plugin install vagrant-reload
diff --git a/ci/manual_machine_bootstrap.sh b/ci/manual_machine_bootstrap.sh
index 1ca8521..3b6794f 100644
--- a/ci/manual_machine_bootstrap.sh
+++ b/ci/manual_machine_bootstrap.sh
@@ -22,8 +22,8 @@ git clone https://github.com/clong/DetectionLab.git /opt/DetectionLab
# Install Vagrant
mkdir /opt/vagrant
cd /opt/vagrant || exit 1
-wget https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb
-dpkg -i vagrant_2.2.4_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.deb
+dpkg -i vagrant_2.2.5_x86_64.deb
vagrant plugin install vagrant-reload
# Make the Vagrant instances headless
@@ -33,8 +33,8 @@ sed -i 's/vb.gui = true/vb.gui = false/g' Vagrantfile
# Install Packer
mkdir /opt/packer
cd /opt/packer || exit 1
-wget --progress=bar:force https://releases.hashicorp.com/packer/1.4.0/packer_1.4.0_linux_amd64.zip
-unzip packer_1.4.0_linux_amd64.zip
+wget --progress=bar:force https://releases.hashicorp.com/packer/1.4.1/packer_1.4.1_linux_amd64.zip
+unzip packer_1.4.1_linux_amd64.zip
cp packer /usr/local/bin/packer
# Make the Packer images headless
diff --git a/ci/manual_machine_bootstrap_vmware.sh b/ci/manual_machine_bootstrap_vmware.sh
index c116aaa..11dc234 100644
--- a/ci/manual_machine_bootstrap_vmware.sh
+++ b/ci/manual_machine_bootstrap_vmware.sh
@@ -28,8 +28,8 @@ git clone https://github.com/clong/DetectionLab.git /opt/DetectionLab
# Install Vagrant
mkdir /opt/vagrant
cd /opt/vagrant || exit 1
-wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb
-dpkg -i vagrant_2.2.4_x86_64.deb
+wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.5/vagrant_2.2.5_x86_64.deb
+dpkg -i vagrant_2.2.5_x86_64.deb
vagrant plugin install vagrant-reload
vagrant plugin install vagrant-vmware-desktop
echo $LICENSEFILE | base64 -d > /tmp/license.lic
@@ -44,8 +44,8 @@ sed -i 's/v.gui = true/v.gui = false/g' Vagrantfile
# Install Packer
mkdir /opt/packer
cd /opt/packer || exit 1
-wget --progress=bar:force https://releases.hashicorp.com/packer/1.4.0/packer_1.4.0_linux_amd64.zip
-unzip packer_1.4.0_linux_amd64.zip
+wget --progress=bar:force https://releases.hashicorp.com/packer/1.4.1/packer_1.4.1_linux_amd64.zip
+unzip packer_1.4.1_linux_amd64.zip
cp packer /usr/local/bin/packer
# Make the Packer images headless