From: Tom Hughes Date: Tue, 2 Feb 2021 16:45:18 +0000 (+0000) Subject: Make sure we use the correct gem and bundler for blogs X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/c87a97890768b4427f078d7deda0d1edf4bb39ce Make sure we use the correct gem and bundler for blogs --- diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index 5af8f53a5..165befb5e 100644 --- a/cookbooks/blogs/recipes/default.rb +++ b/cookbooks/blogs/recipes/default.rb @@ -21,17 +21,26 @@ include_recipe "accounts" include_recipe "apache" include_recipe "git" -package %w[ - ruby - ruby-dev +ruby_version = if node[:lsb][:release].to_f < 20.04 + "2.5" + else + "2.7" + end + +package %W[ + ruby#{ruby_version} + ruby#{ruby_version}-dev make gcc g++ libsqlite3-dev ] -gem_package "bundler" do +gem_package "bundler#{ruby_version}" do + package_name "bundler" version "~> 2.1.4" + gem_binary "gem#{ruby_version}" + options "--format-executable" end directory "/srv/blogs.openstreetmap.org" do @@ -51,7 +60,7 @@ end execute "/srv/blogs.openstreetmap.org/Gemfile" do action :nothing - command "bundle install --deployment" + command "bundle#{ruby_version} install --deployment" cwd "/srv/blogs.openstreetmap.org" user "blogs" group "blogs" @@ -60,7 +69,7 @@ end execute "/srv/blogs.openstreetmap.org" do action :nothing - command "bundle exec pluto build -t osm -o build" + command "bundle#{ruby_version} exec pluto build -t osm -o build" cwd "/srv/blogs.openstreetmap.org" user "blogs" group "blogs" @@ -82,6 +91,7 @@ template "/usr/local/bin/blogs-update" do owner "root" group "root" mode "0755" + variables :ruby_version => ruby_version end cron_d "blogs" do diff --git a/cookbooks/blogs/templates/default/blogs-update.erb b/cookbooks/blogs/templates/default/blogs-update.erb index af245f355..ef880cdf8 100644 --- a/cookbooks/blogs/templates/default/blogs-update.erb +++ b/cookbooks/blogs/templates/default/blogs-update.erb @@ -2,7 +2,7 @@ cd /srv/blogs.openstreetmap.org -bundle exec pluto \ +/usr/local/bin/bundle<%= @ruby_version %> exec pluto \ --quieter \ --config=/srv/blogs.openstreetmap.org build \ --dbpath=/srv/blogs.openstreetmap.org \