Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index a9ef419a0259669c1e2e905d95a58b735c12601d..95abd7890847bf82a2be293460b2334364b514f8 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -18,6 +18,9 @@
 #
 
 include_recipe "apache"
+include_recipe "apt"
+include_recipe "munin"
+include_recipe "prometheus"
 
 package "ruby#{node[:passenger][:ruby_version]}"
 package "ruby#{node[:passenger][:ruby_version]}-dev"
@@ -31,7 +34,7 @@ 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 +57,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