Merge branch 'release/1.20'

Author: dylanmei

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.20 (July 21st, 2014)
+
+* Update Chocolatey script for Chocolatey 0.9.8.27
+* Password for Vagrant user never expires
+* Salt installation script
+* Microsoft-updates.bat script for Win 7/8
+
 ## v1.19 (May 17th, 2014)
 
 * Enable Microsoft Updates by default (#60)
@@ -85,3 +92,4 @@
 ## v1.1 (December 17, 2013)
 
 * Initial release, including working Windows 2008 R2 configuration
+

scripts/chocolatey.bat

@@ -1,5 +1,5 @@
 powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" <NUL
 
-<nul set /p ".=;C:\Chocolatey\bin" >> C:\Windows\Temp\PATH
+<nul set /p ".=;%ALLUSERSPROFILE%\chocolatey\bin" >> C:\Windows\Temp\PATH
 set /p PATH=<C:\Windows\Temp\PATH
-setx PATH "%PATH%" /m
+setx PATH "%PATH%" /m

scripts/salt.bat

@@ -0,0 +1,11 @@
+if not exist "C:\Windows\Temp\salt64.exe" (
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://docs.saltstack.com/downloads/Salt-Minion-2014.1.3-1-AMD64-Setup.exe', 'C:\Windows\Temp\salt64.exe')" <NUL
+)
+
+:: http://docs.saltstack.com/en/latest/topics/installation/windows.html
+c:\windows\temp\salt64.exe /S
+:: /master=<yoursaltmaster> /minion-name=<thisminionname>
+
+<nul set /p ".=;C:\salt" >> C:\Windows\Temp\PATH
+set /p PATH=<C:\Windows\Temp\PATH
+setx PATH "%PATH%" /m

windows_7.json

@@ -18,7 +18,7 @@
       "vnc_port_max": 5980,
       "floppy_files": [
         "./answer_files/7/Autounattend.xml",
-        "./scripts/dis-updates.ps1",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1"
       ],
@@ -45,7 +45,7 @@
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/7/Autounattend.xml",
-        "./scripts/dis-updates.ps1",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1",
         "./scripts/oracle-cert.cer"

windows_81.json

@@ -18,6 +18,7 @@
       "vnc_port_max": 5980,
       "floppy_files": [
         "./answer_files/81/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1"
       ],
@@ -44,6 +45,7 @@
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/81/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1",
         "./scripts/oracle-cert.cer"