From 229bfd4d1ef647515f13b6e8e064a957881f2ca7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 20 Feb 2015 15:58:50 +0000 Subject: [PATCH] Switch dev to use ruby 2.1 for passenger --- cookbooks/dev/recipes/default.rb | 1 + roles/dev.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 039f5b204..62eac34c4 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -134,6 +134,7 @@ if node[:postgresql][:clusters][:"9.1/main"] end node[:dev][:rails].each do |name, details| + ruby node[:passenger][:ruby_version] database_name = details[:database] || "apis_#{name}" site_name = "#{name}.apis.dev.openstreetmap.org" rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org" diff --git a/roles/dev.rb b/roles/dev.rb index aa07120ee..faf7adda3 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -119,6 +119,9 @@ default_attributes( } } }, + :passenger => { + :ruby_version => "2.1" + }, :postgresql => { :versions => ["9.1", "9.3"], :settings => { -- 2.43.2