Merge pull request #8 from dylanmei/update_openssh_6.3

Ensure TEMP and USERPROFILE variables are always available
joefitzgerald · Nov 25, 2013 · 517255a · 517255a
2 parents 52f4a5f + 47a7fa7
commit 517255a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/answer_files/2008_r2/Autounattend.xml b/answer_files/2008_r2/Autounattend.xml
@@ -99,7 +99,7 @@
 					<Value>vagrant</Value>
 					<PlainText>true</PlainText>
 				</Password>
-				<Username>administrator</Username>
+				<Username>vagrant</Username>
 				<Enabled>true</Enabled>
 			</AutoLogon>
 			<FirstLogonCommands>
@@ -225,14 +225,14 @@
 				</SynchronousCommand>
 <!-- WITHOUT WINDOWS UPDATES
 				<SynchronousCommand wcm:action="add">
-					<CommandLine>cmd.exe /c a:\openssh-6.2.bat START</CommandLine>
+					<CommandLine>cmd.exe /c a:\openssh.bat START</CommandLine>
 					<Description>Install OpenSSH</Description>
 					<Order>99</Order>
 					<RequiresUserInput>true</RequiresUserInput>
 				</SynchronousCommand> -->
 <!-- WITH WINDOWS UPDATES -->
 				<SynchronousCommand wcm:action="add">
-					<CommandLine>cmd.exe /c a:\openssh-6.2.bat</CommandLine>
+					<CommandLine>cmd.exe /c a:\openssh.bat</CommandLine>
 					<Description>Install OpenSSH</Description>
 					<Order>99</Order>
 					<RequiresUserInput>true</RequiresUserInput>

diff --git a/answer_files/2012/Autounattend.xml b/answer_files/2012/Autounattend.xml
@@ -100,7 +100,7 @@
 					<Value>vagrant</Value>
 					<PlainText>true</PlainText>
 				</Password>
-				<Username>administrator</Username>
+				<Username>vagrant</Username>
 				<Enabled>true</Enabled>
 			</AutoLogon>
 			<FirstLogonCommands>
@@ -226,14 +226,14 @@
 				</SynchronousCommand>
 <!-- WITHOUT WINDOWS UPDATES
 				<SynchronousCommand wcm:action="add">
-					<CommandLine>cmd.exe /c a:\openssh-6.2.bat START</CommandLine>
+					<CommandLine>cmd.exe /c a:\openssh.bat START</CommandLine>
 					<Description>Install OpenSSH</Description>
 					<Order>99</Order>
 					<RequiresUserInput>true</RequiresUserInput>
 				</SynchronousCommand> -->
 <!-- WITH WINDOWS UPDATES -->
 				<SynchronousCommand wcm:action="add">
-					<CommandLine>cmd.exe /c a:\openssh-6.2.bat</CommandLine>
+					<CommandLine>cmd.exe /c a:\openssh.bat</CommandLine>
 					<Description>Install OpenSSH</Description>
 					<Order>99</Order>
 					<RequiresUserInput>true</RequiresUserInput>
@@ -244,7 +244,6 @@
 					<Order>100</Order>
 					<RequiresUserInput>true</RequiresUserInput>
 				</SynchronousCommand>
-
 			</FirstLogonCommands>
 			<ShowWindowsLive>false</ShowWindowsLive>
 		</component>

diff --git a/scripts/chocolatey.bat b/scripts/chocolatey.bat
@@ -1,5 +1,4 @@
 
-set TEMP=C:\Windows\Temp
 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

diff --git a/scripts/openssh-6.2.bat → scripts/openssh.bat b/scripts/openssh-6.2.bat → scripts/openssh.bat
@@ -1,7 +1,7 @@
 
 :: setup openssh
-powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://www.mls-software.com/files/setupssh-6.2p2-1-v1(x64).exe', 'C:\Windows\Temp\openssh-6.2.exe')"
-cmd /c C:\Windows\temp\openssh-6.2.exe /S /port=22 /privsep=1 /password=D@rj33l1ng
+powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://www.mls-software.com/files/setupssh-6.3p1-1(x64).exe', 'C:\Windows\Temp\openssh.exe')"
+cmd /c C:\Windows\temp\openssh.exe /S /port=22 /privsep=1 /password=D@rj33l1ng
 
 :: ensure vagrant can log in
 mkdir "C:\Users\vagrant\.ssh"
@@ -11,13 +11,15 @@ cmd /c C:\Windows\System32\icacls.exe "C:\Program Files\OpenSSH\usr\sbin" /grant
 powershell -Command "(Get-Content 'C:\Program Files\OpenSSH\etc\passwd') | Foreach-Object { $_ -replace '/home/(\w+)', '/cygdrive/c/Users/$1' } | Set-Content 'C:\Program Files\OpenSSH\etc\passwd'"
 
 :: fix opensshd to not be strict
-powershell -Command "(Get-Content 'C:\Program Files\OpenSSH\etc\sshd_config') | Foreach-Object { $_ -replace 'StrictModes yes', 'StrictModes no' } | Set-Content 'C:\Program Files\OpenSSH\etc\sshd_config'"
-powershell -Command "(Get-Content 'C:\Program Files\OpenSSH\etc\sshd_config') | Foreach-Object { $_ -replace '#PubkeyAuthentication yes', 'PubkeyAuthentication yes' } | Set-Content 'C:\Program Files\OpenSSH\etc\sshd_config'"
+powershell -Command "(Get-Content 'C:\Program Files\OpenSSH\etc\sshd_config') -replace 'StrictModes yes', 'StrictModes no' | Set-Content 'C:\Program Files\OpenSSH\etc\sshd_config'"
+powershell -Command "(Get-Content 'C:\Program Files\OpenSSH\etc\sshd_config') -replace '#PubkeyAuthentication yes', 'PubkeyAuthentication yes' | Set-Content 'C:\Program Files\OpenSSH\etc\sshd_config'"
+powershell -Command "(Get-Content 'C:\Program Files\OpenSSH\etc\sshd_config') -replace '#PermitUserEnvironment no', 'PermitUserEnvironment yes' | Set-Content 'C:\Program Files\OpenSSH\etc\sshd_config'"
 
 :: use Windows\Temp as /tmp location
 rd /S /Q "C:\Program Files\OpenSSH\tmp"
 cmd /c ""C:\Program Files\OpenSSH\bin\junction.exe" /accepteula "C:\Program Files\OpenSSH\tmp" C:\Windows\Temp"
 cmd /c C:\Windows\System32\icacls.exe "C:\Windows\Temp" /grant vagrant:(OI)(CI)F
+powershell -Command "Add-Content C:\Users\vagrant\.ssh\environment "TEMP=C:\Windows\Temp""
 
 :: record the path for use by provisioners
 <nul set /p ".=%PATH%" > C:\Windows\Temp\PATH

diff --git a/scripts/vagrant-ssh.bat b/scripts/vagrant-ssh.bat
@@ -1,6 +1,5 @@
 
 :: vagrant public key
-mkdir "C:\Users\vagrant\.ssh"
 if exist a:\vagrant.pub (
   copy a:\vagrant.pub C:\Users\vagrant\.ssh\authorized_keys
 ) else (

diff --git a/windows_2008_r2.json b/windows_2008_r2.json
@@ -17,7 +17,7 @@
     "floppy_files": [
       "./answer_files/2008_r2/Autounattend.xml",
       "./scripts/win-updates.ps1",
-      "./scripts/openssh-6.2.bat"
+      "./scripts/openssh.bat"
     ],
     "vmx_data": {
       "RemoteDisplay.vnc.enabled": "false",
@@ -41,7 +41,7 @@
     "floppy_files": [
       "./answer_files/2008_r2/Autounattend.xml",
       "./scripts/win-updates.ps1",
-      "./scripts/openssh-6.2.bat",
+      "./scripts/openssh.bat",
       "./scripts/oracle-cert.cer"
     ],
     "vboxmanage": [

diff --git a/windows_2012.json b/windows_2012.json
@@ -17,7 +17,7 @@
     "floppy_files": [
       "./answer_files/2012/Autounattend.xml",
       "./scripts/win-updates.ps1",
-      "./scripts/openssh-6.2.bat"
+      "./scripts/openssh.bat"
     ],
     "vmx_data": {
       "RemoteDisplay.vnc.enabled": "false",
@@ -41,7 +41,7 @@
     "floppy_files": [
       "./answer_files/2012/Autounattend.xml",
       "./scripts/win-updates.ps1",
-      "./scripts/openssh-6.2.bat",
+      "./scripts/openssh.bat",
       "./scripts/oracle-cert.cer"
     ],
     "vboxmanage": [