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

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 769342ef9..159c6b3ca 100644
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # 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,
@@ -18,26 +18,39 @@
 #
 
 include_recipe "apache"
+include_recipe "apt"
+include_recipe "munin"
 
 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
 
-package "passenger-common#{node[:passenger][:ruby_version]}"
+munin_plugin_conf "passenger" do
+  template "munin.erb"
+end
 
 munin_plugin "passenger_memory"
 munin_plugin "passenger_processes"