Merge pull request #620 from Tolomaus/win2008R2-issues

cygwin and ssh issues with the windows-2008R2-serverstandard-amd64 template

templates/windows-2008R2-serverstandard-amd64/definition.rb

@@ -12,8 +12,8 @@
     :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
 
     :floppy_files => [
-      "Autounattend.xml", # automate install and setup winrm
-      "install-cygwin-sshd.bat",
+      "Autounattend.xml", 
+      "install-cygwin-sshd.bat",               
       "install-winrm.bat",
       "oracle-cert.cer"],
 
@@ -30,7 +30,7 @@
     :ssh_login_timeout => "10000",
     # Actively attempt to winrm (no ssh on base windows) in for 10000 seconds
     :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "", 
-    :ssh_host_port => "59856", :ssh_guest_port => "5985",
+    :ssh_host_port => "59856", :ssh_guest_port => "22",
     # And run postinstall.sh for up to 10000 seconds
     :postinstall_timeout => "10000",
     :postinstall_files => ["postinstall.sh"],

templates/windows-2008R2-serverstandard-amd64/install-cygwin-sshd.bat

@@ -2,13 +2,14 @@ REM http://webcache.googleusercontent.com/search?q=cache:SjoPPpuQxuoJ:www.tcm.ph
 
 REM create the cygwin directory
 cmd /c mkdir %SystemDrive%\cygwin
-copy a:\cygwin-setup.exe %SystemDrive%\cygwin
+
+cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup.exe %SystemDrive%\cygwin\cygwin-setup.exe
 
 REM goto a temp directory
 cd %SystemDrive%\windows\temp
 
 REM run the installation
-cmd /c a:/cygwin-setup.exe -q -R %SystemDrive%\cygwin -P openssh,openssl,curl,cygrunsrv,wget,rebase,vim -s http://cygwin.mirrors.pair.com
+cmd /c %SystemDrive%\cygwin\cygwin-setup.exe -q -R %SystemDrive%\cygwin -P openssh,openssl,curl,cygrunsrv,wget,rebase,vim -s http://cygwin.mirrors.pair.com
 
 %SystemDrive%\cygwin\bin\bash -c 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin cygrunsrv -R sshd'