spamassassin: Use correct daemon name on Ubuntu 24.04

openstreetmap · Jul 29, 2024 · 0b828fd · 0b828fd
1 parent 7542ad3
commit 0b828fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
@@ -19,11 +19,11 @@
 
 package "spamassassin"
 
-service_name = if platform?("debian")
-                 "spamd"
-               else
-                 "spamassassin"
-               end
+service_name = if platform?("debian") || (platform?("ubuntu") && node[:lsb][:release].to_f >= 24.04)
+  "spamd"
+else
+  "spamassassin"
+end
 
 service service_name do
   action [:enable, :start]

diff --git a/test/integration/spamassassin/inspec/spamassassin_spec.rb b/test/integration/spamassassin/inspec/spamassassin_spec.rb
@@ -1,4 +1,4 @@
-service_name = if os.name == "debian"
+service_name = if os.name == "debian" || (os.name == "ubuntu" && os.release.to_f >= 24.04)
                  "spamd"
                else
                  "spamassassin"