From 070b4413a3ca34a457a421f128b7374e6dfc9a7c Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 29 Jul 2024 16:52:50 +0100 Subject: [PATCH] spamassassin: Use correct daemon name on Ubuntu 24.04 --- cookbooks/spamassassin/recipes/default.rb | 2 +- test/integration/mail/inspec/spamassassin_spec.rb | 2 +- test/integration/spamassassin/inspec/spamassassin_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb index 108656af2..b9f5aa0bb 100644 --- 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 18506eaa0..2b14c3962 100644 --- 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 18506eaa0..2b14c3962 100644 --- 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" -- 2.39.5