Skip to content

Commit 0b828fd

Browse files
committed
spamassassin: Use correct daemon name on Ubuntu 24.04
1 parent 7542ad3 commit 0b828fd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cookbooks/spamassassin/recipes/default.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
package "spamassassin"
2121

22-
service_name = if platform?("debian")
23-
"spamd"
24-
else
25-
"spamassassin"
26-
end
22+
service_name = if platform?("debian") || (platform?("ubuntu") && node[:lsb][:release].to_f >= 24.04)
23+
"spamd"
24+
else
25+
"spamassassin"
26+
end
2727

2828
service service_name do
2929
action [:enable, :start]

test/integration/spamassassin/inspec/spamassassin_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
service_name = if os.name == "debian"
1+
service_name = if os.name == "debian" || (os.name == "ubuntu" && os.release.to_f >= 24.04)
22
"spamd"
33
else
44
"spamassassin"

0 commit comments

Comments
 (0)