Standardise on "hash rocket" style for hashes

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

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index 1326b02135d7d9c21ec69fbe5986c8f306e45fe1..dd1e19eb1bff77fb8a475f562f288944594c44a0 100644 (file)
--- 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"