diff --git a/README.md b/README.md index 5d3e1ca..72cf86e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,11 @@ Installs Virtualbox on OS X, Debian/Ubuntu or Windows. Changes ======= +## v2.0 + +* Update to Virtualbox 5.1 as default +* Point to new VirtualBox Ubuntu 2016 signing key + ## v1.0.4 * Add chefignore diff --git a/attributes/default.rb b/attributes/default.rb index a7eb105..463e46a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -23,10 +23,10 @@ case node['platform_family'] when 'mac_os_x' - default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/4.2.12/VirtualBox-4.2.12-84980-OSX.dmg' + default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/5.1.14/VirtualBox-5.1.14-112924-OSX.dmg' when 'windows' - default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/4.2.12/VirtualBox-4.2.12-84980-Win.exe' + default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/5.1.14/VirtualBox-5.1.14-112924-Win.exe' default['virtualbox']['version'] = Vbox::Helpers.vbox_version(node['virtualbox']['url']) when 'debian', 'rhel', 'fedora' - default['virtualbox']['version'] = '4.3' + default['virtualbox']['version'] = '5.1' end diff --git a/metadata.rb b/metadata.rb index de6ab82..18932be 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs virtualbox" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "1.0.4" +version "2.0.1" %w{ubuntu debian centos redhat mac_os_x windows fedora}.each do |os| supports os diff --git a/recipes/default.rb b/recipes/default.rb index b51fa07..3ca4faa 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -46,7 +46,8 @@ apt_repository 'oracle-virtualbox' do uri 'http://download.virtualbox.org/virtualbox/debian' - key 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc' + key 'A2F683C52980AECF' + #key 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc' distribution node['lsb']['codename'] components ['contrib'] end @@ -57,10 +58,10 @@ when 'rhel', 'fedora' yum_repository 'oracle-virtualbox' do - description "#{node['platform_family']} $releasever - $basearch - Virtualbox" + description "#{node['platform_family']} $releasever - $basearch - Virtualbox" baseurl "http://download.virtualbox.org/virtualbox/rpm/#{node['platform_family']}/$releasever/$basearch" gpgcheck true - gpgkey 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc' + gpgkey 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc' end package "VirtualBox-#{node['virtualbox']['version']}"