Remove arcfour (RC4) cipher no longer available in newer OpenSSH

[chef.git] / cookbooks / passenger / recipes / default.rb

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 6656ce338544a50b91ea9f243c083a8441d6acdc..229281c055167dcec3d3fc362a8761efb6388b0b 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -19,6 +19,14 @@
 
 include_recipe "apache"
 
 
 include_recipe "apache"
 

+package "ruby#{node[:passenger][:ruby_version]}"
+package "ruby#{node[:passenger][:ruby_version]}-dev"
+
+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"
   owner "root"
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
   owner "root"


@@ -31,8 +39,6 @@ apache_module "passenger" do
   conf "passenger.conf.erb"
 end
 
   conf "passenger.conf.erb"
 end
 

-package "passenger-common#{node[:passenger][:ruby_version]}"
-

 munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"
 munin_plugin "passenger_queues"
 munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"
 munin_plugin "passenger_queues"