Port custom firewall rule to nftables

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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index a9ef419a0259669c1e2e905d95a58b735c12601d..47b4018b711d49f2dc08d795e9fb748ed608eae8 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -18,20 +18,16 @@
 #
 
 include_recipe "apache"
 #
 
 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"
 
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end
 


@@ -54,3 +50,10 @@ 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]
+  restrict_address_families "AF_UNIX"
+end