From 8b15f39477a8246b3aff1eaee870379639ecec5f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 20 Feb 2015 16:08:30 +0000 Subject: [PATCH] There is no separate rubygems or irb for ruby 1.9 and later --- cookbooks/passenger/recipes/default.rb | 7 +++++-- cookbooks/web/definitions/rails_port.rb | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb index 267942f0a..229281c05 100644 --- a/cookbooks/passenger/recipes/default.rb +++ b/cookbooks/passenger/recipes/default.rb @@ -21,8 +21,11 @@ include_recipe "apache" package "ruby#{node[:passenger][:ruby_version]}" package "ruby#{node[:passenger][:ruby_version]}-dev" -package "rubygems#{node[:passenger][:ruby_version]}" -package "irb#{node[:passenger][:ruby_version]}" + +if node[:passenger][:ruby_version].to_f < 1.9 + package "rubygems#{node[:passenger][:ruby_version]}" + package "irb#{node[:passenger][:ruby_version]}" +end template "/usr/local/bin/passenger-ruby" do source "ruby.erb" diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index a072a88b6..205695c08 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -40,8 +40,8 @@ define :rails_port, :action => [:create, :enable] do package "ruby#{ruby_version}" package "ruby#{ruby_version}-dev" - package "rubygems#{ruby_version}" - package "irb#{ruby_version}" + package "rubygems#{ruby_version}" if ruby_version.to_f < 1.9 + package "irb#{ruby_version}" if ruby_version.to_f < 1.9 package "imagemagick" package "nodejs" -- 2.43.2