X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/121121d81991ae8af9e9ec0ff45a0b77a8c48543..af08abd9a84a360f523def1d5dde94f909d8553f:/cookbooks/spamassassin/recipes/default.rb

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index 1326b0213..dd1e19eb1 100644
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -20,15 +20,14 @@
 package "spamassassin"
 
 service "spamassassin" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
 directory "/var/spool/spamassassin" do
-  owner "mail"
-  group "mail"
+  owner "debian-spamd"
+  group "debian-spamd"
   mode 0755
-  action :create
 end
 
 template "/etc/default/spamassassin" do
@@ -43,11 +42,11 @@ trusted_networks = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
   search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host|
-    trusted_networks = trusted_networks | host.ipaddresses(:role => :external)
+    trusted_networks |= host.ipaddresses(:role => :external)
   end
 end
 
-trusted_networks = trusted_networks - [ "127.0.0.1", "::1" ]
+trusted_networks -= ["127.0.0.1", "::1"]
 
 template "/etc/spamassassin/local.cf" do
   source "local.cf.erb"