Skip to content

Commit

Permalink
Fix Riak EE download URL following 2.1 release
Browse files Browse the repository at this point in the history
While I'd prefer that #170 be merged, in order to speed things along in case there's concern about the version bump, here's an alternative patch with only the part that fixes the broken Riak EE download URL.

For posterity: The difference between the URLs is that the new one omits the `major_minor` part of the path.
  • Loading branch information
brandt committed Jun 16, 2015
1 parent 8d220ca commit 5bfc238
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion recipes/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@
major_minor = %w(major minor).map { |ver| node['riak']['package']['version'][ver] }.join('.')
package_version = "#{version_str}-#{node['riak']['package']['version']['build']}"
install_method = node['platform'] == 'freebsd' || oss_or_ee == 'riak-ee' ? 'custom_package' : node['riak']['install_method']
ee_url_prefix = "http://private.downloads.basho.com/riak_ee/#{node['riak']['package']['enterprise_key']}/#{major_minor}/#{version_str}"
plat_ver_int = node['platform_version'].to_i

# Enterprise download URL changed with release of 2.1
if major_minor.to_f >= 2.1
ee_url_prefix = "http://private.downloads.basho.com/riak_ee/#{node['riak']['package']['enterprise_key']}/#{major_minor}/#{version_str}"
else
ee_url_prefix = "http://private.downloads.basho.com/riak_ee/#{node['riak']['package']['enterprise_key']}/#{version_str}"
end

case install_method
when 'package', 'custom_repository'
case node['platform']
Expand Down

0 comments on commit 5bfc238

Please sign in to comment.