Merge remote-tracking branch 'upstream/master' into win2k8-qemu-fix

chef/cookbooks/metasploitable/recipes/clear_cache.rb

@@ -4,9 +4,8 @@
 #
 # Copyright:: 2017, Rapid7, All Rights Reserved.
 
-bash 'clear cache and backup that might contain sensitive information' do
-  code <<-EOH
-  cd /var/chef
-  rm -R *
-  EOH
-end
+# 'clear cache and backup that might contain sensitive information' do
+directory '/var/chef' do
+  action :delete
+  recursive true
+end

packer/templates/windows_2008_r2.json

@@ -185,7 +185,7 @@
     {
       "type": "powershell",
       "inline": [
-        "$env:chocolateyVersion = '0.10.8'; iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))"
+        "$env:chocolateyVersion = '0.10.8'; [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))"
       ],
       "pause_before": "60s"
     },

scripts/chocolatey_installs/java.bat

@@ -1,4 +1,4 @@
 chocolatey feature enable -n=allowGlobalConfirmation
-choco install javaruntime-platformspecific
+choco install jre8 --version 8.0.251
 chocolatey feature disable -n=allowGlobalConfirmation
-exit
+exit

scripts/installs/install_chocolatey.ps1

@@ -1,5 +1,6 @@
 $ChocoInstallPath = "$env:SystemDrive\ProgramData\Chocolatey\bin"
 
 if (!(Test-Path $ChocoInstallPath)) {
+  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
   iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
 }

scripts/installs/install_elasticsearch.bat

@@ -1,4 +1,4 @@
-powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://repo1.maven.org/maven2/org/elasticsearch/elasticsearch/1.1.1/elasticsearch-1.1.1.zip', 'C:\Windows\Temp\elasticsearch-1.1.1.zip')" <NUL
+powershell -Command "[System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true} ; (New-Object System.Net.WebClient).DownloadFile('http://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.1.1.zip', 'C:\Windows\Temp\elasticsearch-1.1.1.zip')" <NUL
 cmd /c ""C:\Program Files\7-Zip\7z.exe" x "C:\Windows\Temp\elasticsearch-1.1.1.zip" -o"C:\Program Files\""
 cmd /c ""C:\Program Files\elasticsearch-1.1.1\bin\service.bat" install"
 sc config "elasticsearch-service-x64" start= auto