Merge remote-tracking branch 'github/pull/704'

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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 95abd7890847bf82a2be293460b2334364b514f8..4ad7f8b0ecb8c65152abdf1970aefbeb58879950 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -18,17 +18,9 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

-include_recipe "apt"
-include_recipe "munin"
+include_recipe "apt::passenger"

 include_recipe "prometheus"
 include_recipe "prometheus"

-
-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
+include_recipe "ruby"

 
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
 
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"


@@ -49,16 +41,10 @@ apache_module "passenger" do
   conf "passenger.conf.erb"
 end
 
   conf "passenger.conf.erb"
 end
 

-munin_plugin_conf "passenger" do
-  template "munin.erb"
-end
-
-munin_plugin "passenger_memory"
-munin_plugin "passenger_processes"
-munin_plugin "passenger_queues"
-munin_plugin "passenger_requests"
-

 prometheus_exporter "passenger" do
   port 9149
 prometheus_exporter "passenger" do
   port 9149

+  user "root"

   environment "PASSENGER_INSTANCE_REGISTRY_DIR" => node[:passenger][:instance_registry_dir]
   environment "PASSENGER_INSTANCE_REGISTRY_DIR" => node[:passenger][:instance_registry_dir]

+  options "--passenger.command.timeout-seconds=5"
+  restrict_address_families "AF_UNIX"

 end
 end