From 117c6e6deb7308023aaf39baa3c0f070432de0da Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 22 Jul 2022 09:39:32 +0100 Subject: [PATCH 1/1] Don't process mail jobs on Ubuntu 22.04 machines The mail jobs are affected by a ruby 3 compatibility issue in the DelayedJob gem: https://github.com/collectiveidea/delayed_job/issues/1134 --- cookbooks/web/recipes/frontend.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index e18974af8..161c5aeb6 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -63,11 +63,17 @@ template "/etc/logrotate.d/apache2" do 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 -- 2.45.2