From: Tom Hughes <tom@compton.nu>
Date: Sat, 23 Jul 2022 11:15:26 +0000 (+0100)
Subject: Re-enable mail jobs on Ubuntu 22.04 machines
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/06bf1884b2061b9649f2eb02d22c0f803da4df53

Re-enable mail jobs on Ubuntu 22.04 machines
---

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