From 684eb5790644fb4e65066a2db902be441b8354bb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 29 Jul 2020 21:51:02 +0100 Subject: [PATCH 1/1] Find the path to bundler --- cookbooks/web/recipes/rails.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index f9a061498..caf20279f 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -115,13 +115,25 @@ rails_port "www.openstreetmap.org" do storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com" end +gem_package "bundler#{ruby_version}" do + package_name "bundler" + gem_binary "gem#{ruby_version}" + options "--format-executable" +end + +bundle = if File.exist?("/usr/bin/bundle#{ruby_version}") + "/usr/bin/bundle#{ruby_version}" + else + "/usr/local/bin/bundle#{ruby_version}" + end + systemd_service "rails-jobs@" do description "Rails job queue runner" type "simple" environment "RAILS_ENV" => "production", "QUEUE" => "%I" user "rails" working_directory rails_directory - exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work" + exec_start "#{bundle} exec rake jobs:work" restart "on-failure" private_tmp true private_devices true -- 2.39.5