Add role for kessie

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

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index ec1109c763447185fa0d50af7914b2a8a905b6b1..dd1e19eb1bff77fb8a475f562f288944594c44a0 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -20,27 +20,33 @@
 package "spamassassin"
 
 service "spamassassin" do
 package "spamassassin"
 
 service "spamassassin" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

+directory "/var/spool/spamassassin" do
+  owner "debian-spamd"
+  group "debian-spamd"
+  mode 0755
+end
+

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

-  notifies :restart, resources(:service => "spamassassin")
+  notifies :restart, "service[spamassassin]"

 end
 
 trusted_networks = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
   search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host|
 end
 
 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
 
   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"
 
 template "/etc/spamassassin/local.cf" do
   source "local.cf.erb"


@@ -48,5 +54,5 @@ template "/etc/spamassassin/local.cf" do
   group "root"
   mode 0644
   variables :trusted_networks => trusted_networks.sort
   group "root"
   mode 0644
   variables :trusted_networks => trusted_networks.sort

-  notifies :restart, resources(:service => "spamassassin")
+  notifies :restart, "service[spamassassin]"

 end
 end