From 06bf1884b2061b9649f2eb02d22c0f803da4df53 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 23 Jul 2022 12:15:26 +0100 Subject: [PATCH] Re-enable mail jobs on Ubuntu 22.04 machines --- cookbooks/web/recipes/frontend.rb | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index 161c5aeb6..e18974af8 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -63,17 +63,11 @@ template "/etc/logrotate.d/apache2" do mode "644" end -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 +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 service "rails-jobs@storage" do -- 2.45.1