X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc..3b563e12600d3519011cde414ee0465698a7814f:/cookbooks/web/recipes/rails.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index f9a061498..e14c898c7 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -55,7 +55,7 @@ rails_directory = "#{node[:web][:base_directory]}/rails"
 piwik = data_bag_item("web", "piwik")
 
 storage = {
-  "aws" => {
+  "avatars" => {
     "service" => "S3",
     "access_key_id" => "AKIASQUXHPE7AMJQRFOS",
     "secret_access_key" => web_passwords["aws_key"],
@@ -91,6 +91,7 @@ rails_port "www.openstreetmap.org" do
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
+  oauth_application web_passwords["oauth_application"]
   piwik_configuration "location" => piwik[:location],
                       "site" => piwik[:site],
                       "goals" => piwik[:goals].to_hash
@@ -111,17 +112,29 @@ rails_port "www.openstreetmap.org" do
   trace_use_job_queue true
   diary_feed_delay 12
   storage_configuration storage
-  storage_service "aws"
+  storage_service "avatars"
   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