From c9c9ccd01efe21f650cab8fce05210f60c7a76cc Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Mar 2019 18:52:04 +0000 Subject: [PATCH 1/1] Restrict queue runners on the main site to the mailers queue --- cookbooks/web/recipes/frontend.rb | 4 ++++ cookbooks/web/recipes/rails.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index 71a7c4384..eb95b18f7 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -50,6 +50,10 @@ template "/etc/logrotate.d/apache2" do end service "rails-jobs" do + action [:stop, :disable] +end + +service "rails-jobs@mailers" do action [:enable, :start] supports :restart => true subscribes :restart, "rails_port[www.openstreetmap.org]" diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index b11da462b..1ab7bc1da 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -94,8 +94,13 @@ rails_port "www.openstreetmap.org" do end systemd_service "rails-jobs" do + action :delete +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" -- 2.43.2