]> git.openstreetmap.org Git - chef.git/commitdiff
Don't process mail jobs on Ubuntu 22.04 machines
authorTom Hughes <tom@compton.nu>
Fri, 22 Jul 2022 08:39:32 +0000 (09:39 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 22 Jul 2022 08:39:32 +0000 (09:39 +0100)
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

index e18974af8507c7e441c7e7408897a8420ebdd18d..161c5aeb63a99cdd45b2fd0b9e62a78c3ce3fb5c 100644 (file)
@@ -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