X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dfab91c7e642641c5bae4cf0ca7904846805fca3..c2ae372eb008748ab79461d80bb1f1725f0f68a4:/cookbooks/passenger/recipes/default.rb

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 8b74aa0c0..88570434f 100644
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,24 +21,33 @@ include_recipe "apache"
 
 package "ruby#{node[:passenger][:ruby_version]}"
 package "ruby#{node[:passenger][:ruby_version]}-dev"
-package "rubygems#{node[:passenger][:ruby_version]}"
-package "irb#{node[:passenger][:ruby_version]}"
+
+if node[:passenger][:ruby_version].to_f < 1.9
+  package "rubygems#{node[:passenger][:ruby_version]}"
+  package "irb#{node[:passenger][:ruby_version]}"
+end
 
 template "/usr/local/bin/passenger-ruby" do
   source "ruby.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   notifies :reload, "service[apache2]"
 end
 
+systemd_tmpfile node[:passenger][:instance_registry_dir] do
+  type "d"
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
 apache_module "passenger" do
-  version node[:passenger][:version]
   conf "passenger.conf.erb"
 end
 
-if node[:passenger][:version] < "4"
-  package "passenger-common#{node[:passenger][:ruby_version]}"
+munin_plugin_conf "passenger" do
+  template "munin.erb"
 end
 
 munin_plugin "passenger_memory"