X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d6ed0a8d7822828b12aa2c90c6bcc62f780c2fa5..a406b373ee9a85b2f79e187b582379326b7b70d2:/cookbooks/passenger/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 88570434f..74eba83eb 100644
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: passenger
+# Cookbook:: passenger
 # Recipe:: default
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,20 +18,16 @@
 #
 
 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
+include_recipe "apt::passenger"
+include_recipe "munin"
+include_recipe "prometheus"
+include_recipe "ruby"
 
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
   notifies :reload, "service[apache2]"
 end
 
@@ -54,3 +50,8 @@ munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"
 munin_plugin "passenger_queues"
 munin_plugin "passenger_requests"
+
+prometheus_exporter "passenger" do
+  port 9149
+  environment "PASSENGER_INSTANCE_REGISTRY_DIR" => node[:passenger][:instance_registry_dir]
+end