spamassassin: Use correct daemon name on Ubuntu 24.04

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index 108656af23384684145118c5411f112c3ef15451..b9f5aa0bbf24a4acb48bb45ce689e88c51c0e2c9 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -19,7 +19,7 @@
 
 package "spamassassin"
 
-service_name = if platform?("debian")
+service_name = if platform?("debian") || (platform?("ubuntu") && node[:lsb][:release].to_f >= 24.04)
                  "spamd"
                else
                  "spamassassin"

diff --git a/test/integration/mail/inspec/spamassassin_spec.rb b/test/integration/mail/inspec/spamassassin_spec.rb
index 18506eaa0371f27c9586bce6a1a821ece0f6c3b0..2b14c39625fa59d84770fd98c02b362438fc09b5 100644 (file)
--- a/test/integration/mail/inspec/spamassassin_spec.rb
+++ b/test/integration/mail/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"

diff --git a/test/integration/spamassassin/inspec/spamassassin_spec.rb b/test/integration/spamassassin/inspec/spamassassin_spec.rb
index 18506eaa0371f27c9586bce6a1a821ece0f6c3b0..2b14c39625fa59d84770fd98c02b362438fc09b5 100644 (file)
--- 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"