Commit 24866782 authored by Dylan Meissner's avatar Dylan Meissner
Browse files

Merge branch 'release-1.20'

parents 203c7a3f 7772ac41
## 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
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
\ No newline at end of file
setx PATH "%PATH%" /m
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
......@@ -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"
......
......@@ -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"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment