From bc87ac56b8734cbb2ce77d4c54868cf7b2f08acd Mon Sep 17 00:00:00 2001 From: Joe Fitzgerald Date: Fri, 2 May 2014 15:28:06 -0500 Subject: [PATCH] Fix ISO Urls (Fixes #47) - Windows 7 is still broken --- CHANGELOG.md | 4 ++++ windows_2008_r2.json | 8 ++++---- windows_2008_r2_core.json | 2 +- windows_2012.json | 8 ++++---- windows_2012_r2.json | 8 ++++---- windows_2012_r2_core.json | 8 ++++---- windows_7.json | 6 +++--- windows_81.json | 2 +- 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67590f7d..d7991c27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v1.13 (May 2nd, 2014) + +* Fixed ISO Urls (#47) + ## v1.12 (April 29th, 2014) * Update OpenSSH diff --git a/windows_2008_r2.json b/windows_2008_r2.json index 2cabfde5..0061906f 100644 --- a/windows_2008_r2.json +++ b/windows_2008_r2.json @@ -2,7 +2,7 @@ "builders": [ { "type": "vmware-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", "iso_checksum_type": "md5", "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5", "headless": true, @@ -28,7 +28,7 @@ "numvcpus": "2", "scsi0.virtualDev": "lsisas1068" } - }, + }, { "type": "virtualbox-iso", "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", @@ -64,7 +64,7 @@ "./scripts/chef.bat", "./scripts/vagrant-ssh.bat" ] - }, + }, { "type": "shell", "inline": ["rm -rf /tmp/*"] } @@ -77,4 +77,4 @@ "vagrantfile_template": "vagrantfile-windows_2008_r2.template" } ] -} \ No newline at end of file +} diff --git a/windows_2008_r2_core.json b/windows_2008_r2_core.json index bc6aac34..06cd42d9 100644 --- a/windows_2008_r2_core.json +++ b/windows_2008_r2_core.json @@ -29,7 +29,7 @@ } }, { "type": "virtualbox-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", "iso_checksum_type": "md5", "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5", "headless": true, diff --git a/windows_2012.json b/windows_2012.json index 5c0e355b..ed0d97a8 100644 --- a/windows_2012.json +++ b/windows_2012.json @@ -2,7 +2,7 @@ "builders": [ { "type": "vmware-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", + "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", "iso_checksum_type": "md5", "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d", "headless": true, @@ -28,7 +28,7 @@ "numvcpus": "2", "scsi0.virtualDev": "lsisas1068" } - }, + }, { "type": "virtualbox-iso", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO", @@ -64,7 +64,7 @@ "./scripts/chef.bat", "./scripts/vagrant-ssh.bat" ] - }, + }, { "type": "shell", "inline": ["rm -rf /tmp/*"] } @@ -77,4 +77,4 @@ "vagrantfile_template": "vagrantfile-windows_2012.template" } ] -} \ No newline at end of file +} diff --git a/windows_2012_r2.json b/windows_2012_r2.json index c3ca722c..748d2c5e 100644 --- a/windows_2012_r2.json +++ b/windows_2012_r2.json @@ -2,7 +2,7 @@ "builders": [ { "type": "vmware-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO", + "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO", "iso_checksum_type": "md5", "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a", "headless": true, @@ -28,7 +28,7 @@ "numvcpus": "2", "scsi0.virtualDev": "lsisas1068" } - }, + }, { "type": "virtualbox-iso", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO", @@ -64,7 +64,7 @@ "./scripts/chef.bat", "./scripts/vagrant-ssh.bat" ] - }, + }, { "type": "shell", "inline": ["rm -rf /tmp/*"] } @@ -77,4 +77,4 @@ "vagrantfile_template": "vagrantfile-windows_2012_r2.template" } ] -} \ No newline at end of file +} diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json index 83ddc4cf..5b557684 100644 --- a/windows_2012_r2_core.json +++ b/windows_2012_r2_core.json @@ -2,7 +2,7 @@ "builders": [ { "type": "vmware-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO", + "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO", "iso_checksum_type": "md5", "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a", "headless": true, @@ -28,7 +28,7 @@ "numvcpus": "2", "scsi0.virtualDev": "lsisas1068" } - }, + }, { "type": "virtualbox-iso", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO", @@ -64,7 +64,7 @@ "./scripts/chef.bat", "./scripts/vagrant-ssh.bat" ] - }, + }, { "type": "shell", "inline": ["rm -rf /tmp/*"] } @@ -77,4 +77,4 @@ "vagrantfile_template": "vagrantfile-windows_2012_r2.template" } ] -} \ No newline at end of file +} diff --git a/windows_7.json b/windows_7.json index c901f774..84e23fc0 100644 --- a/windows_7.json +++ b/windows_7.json @@ -2,7 +2,7 @@ "builders": [ { "type": "vmware-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_url": "http://download.microsoft.com/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", "iso_checksum_type": "md5", "iso_checksum": "1d0d239a252cb53e466d39e752b17c28", "headless": true, @@ -29,7 +29,7 @@ "numvcpus": "2", "scsi0.virtualDev": "lsisas1068" } - }, + }, { "type": "virtualbox-iso", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", @@ -66,7 +66,7 @@ "./scripts/chef.bat", "./scripts/vagrant-ssh.bat" ] - }, + }, { "type": "shell", "inline": ["rm -rf /tmp/*"] } diff --git a/windows_81.json b/windows_81.json index 01546328..a6f96405 100644 --- a/windows_81.json +++ b/windows_81.json @@ -2,7 +2,7 @@ "builders": [ { "type": "vmware-iso", - "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO", + "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO", "iso_checksum_type": "md5", "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec", "headless": true,