X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/67dd81a83b573132e0423134ab5dfbbde7da71e3..430c285e33e61a004ec7bb05b71348bad48d279a:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index ea9a58c4e..6d6e6639c 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -47,12 +47,13 @@ template "/etc/cron.hourly/passenger" do mode 0o755 end +ruby_version = node[:passenger][:ruby_version] rails_directory = "#{node[:web][:base_directory]}/rails" piwik = data_bag_item("web", "piwik") rails_port "www.openstreetmap.org" do - ruby node[:passenger][:ruby_version] + ruby ruby_version directory rails_directory user "rails" group "rails" @@ -87,10 +88,25 @@ rails_port "www.openstreetmap.org" do github_auth_secret web_passwords["github_auth_secret"] wikipedia_auth_id "e4fe0c2c5855d23ed7e1f1c0fa1f1c58" wikipedia_auth_secret web_passwords["wikipedia_auth_secret"] - mapzen_valhalla_key web_passwords["mapzen_valhalla_key"] thunderforest_key web_passwords["thunderforest_key"] totp_key web_passwords["totp_key"] csp_enforce true + trace_use_job_queue true +end + +systemd_service "rails-jobs@" do + description "Rails job queue runner" + type "simple" + environment "QUEUE" => "%I" + user "rails" + working_directory rails_directory + exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work" + restart "on-failure" + private_tmp true + private_devices true + protect_system "full" + protect_home true + no_new_privileges true end package "libjson-xs-perl"