nominatim: switch stormfly back to php frontend

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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 5ad02602308af216327c92e2de582b4f87bf80a6..e162e612f7bb58581065bfc1e07f38beda394f69 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -18,16 +18,10 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

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

 include_recipe "munin"
 include_recipe "munin"

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

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


@@ -56,3 +50,11 @@ munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"
 munin_plugin "passenger_queues"
 munin_plugin "passenger_requests"
 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