supybot: more aggressive init stop

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

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index 6c64083b8df58da66de8d99b2a0f18b6e322fabf..28e3a1cd5a42d5aa8afeb7db81d15f5bab725a8b 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -20,21 +20,21 @@
 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 "debian-spamd"
   group "debian-spamd"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/default/spamassassin" do
   source "spamassassin.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[spamassassin]"
 end
 
@@ -42,17 +42,17 @@ 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"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :trusted_networks => trusted_networks.sort
   notifies :restart, "service[spamassassin]"
 end