Change default postgres version for tile servers to 14

[chef.git] / cookbooks / spamassassin / recipes / default.rb

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index 49b15a583da44975fd1232d3381b5bdd9b81eece..db498b75f4bf7bd52681734664301f3caae08098 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -19,7 +19,13 @@
 
 package "spamassassin"
 
 
 package "spamassassin"
 

-service "spamassassin" do
+service_name = if platform?("debian")
+                 "spamd"
+               else
+                 "spamassassin"
+               end
+
+service service_name do

   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end


@@ -27,15 +33,15 @@ end
 directory "/var/spool/spamassassin" do
   owner "debian-spamd"
   group "debian-spamd"
 directory "/var/spool/spamassassin" do
   owner "debian-spamd"
   group "debian-spamd"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/default/spamassassin" do
   source "spamassassin.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/default/spamassassin" do
   source "spamassassin.erb"
   owner "root"
   group "root"

-  mode 0o644
-  notifies :restart, "service[spamassassin]"
+  mode "644"
+  notifies :restart, "service[#{service_name}]"

 end
 
 trusted_networks = node[:exim][:relay_from_hosts]
 end
 
 trusted_networks = node[:exim][:relay_from_hosts]


@@ -52,7 +58,7 @@ template "/etc/spamassassin/local.cf" do
   source "local.cf.erb"
   owner "root"
   group "root"
   source "local.cf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :trusted_networks => trusted_networks.sort
   variables :trusted_networks => trusted_networks.sort

-  notifies :restart, "service[spamassassin]"
+  notifies :restart, "service[#{service_name}]"

 end
 end