X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ed01537d8749e38350d6a52c4cc9be473b2c44c4..ab49f1fed889c2eac1ffd67fe8035c98d5a001b9:/cookbooks/passenger/recipes/default.rb diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb index 95abd7890..4ad7f8b0e 100644 --- a/cookbooks/passenger/recipes/default.rb +++ b/cookbooks/passenger/recipes/default.rb @@ -18,17 +18,9 @@ # include_recipe "apache" -include_recipe "apt" -include_recipe "munin" +include_recipe "apt::passenger" 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" @@ -49,16 +41,10 @@ apache_module "passenger" do 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 + user "root" environment "PASSENGER_INSTANCE_REGISTRY_DIR" => node[:passenger][:instance_registry_dir] + options "--passenger.command.timeout-seconds=5" + restrict_address_families "AF_UNIX" end