Skip to content

Commit

Permalink
Don't process mail jobs on Ubuntu 22.04 machines
Browse files Browse the repository at this point in the history
The mail jobs are affected by a ruby 3 compatibility issue in
the DelayedJob gem:

collectiveidea/delayed_job#1134
  • Loading branch information
tomhughes committed Jul 22, 2022
1 parent cba7532 commit 117c6e6
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions cookbooks/web/recipes/frontend.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,17 @@
mode "644"
end

service "rails-jobs@mailers" do
action [:enable, :start]
supports :restart => true
subscribes :restart, "rails_port[www.openstreetmap.org]"
subscribes :restart, "systemd_service[rails-jobs]"
if node[:lsb][:release].to_f < 22.04
service "rails-jobs@mailers" do
action [:enable, :start]
supports :restart => true
subscribes :restart, "rails_port[www.openstreetmap.org]"
subscribes :restart, "systemd_service[rails-jobs]"
end
else
service "rails-jobs@mailers" do
action [:disable, :stop]
end
end

service "rails-jobs@storage" do
Expand Down

0 comments on commit 117c6e6

Please sign in to comment.