X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/10e1976e6e9fd98e058831e93fbec2eafd9c8167..eeff0cc95ba24ebe4c955a940785a5ab62c74f2f:/cookbooks/passenger/attributes/default.rb diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb index 9af69741f..29f75e3ae 100644 --- a/cookbooks/passenger/attributes/default.rb +++ b/cookbooks/passenger/attributes/default.rb @@ -1,10 +1,6 @@ -default[:passenger][:version] = 5 -default[:passenger][:ruby_version] = "1.9.1" +default[:passenger][:ruby_version] = node[:lsb][:release].to_f >= 18.04 ? "2.5" : "2.3" default[:passenger][:max_pool_size] = 6 default[:passenger][:pool_idle_time] = 300 +default[:passenger][:instance_registry_dir] = "/run/passenger" -if node[:passenger][:version] == 4 - default[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger4"] -else - default[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger"] -end +default[:apt][:sources] = node[:apt][:sources] | ["passenger"]