Improve detection of unassigned drives on HP controllers

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

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index e9150a55d219d6851fa8af05e82d9c90c9a9d7d2..d9af52bd1bbdc816cb415c7131286cbde2ef0f6a 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: spamassassin
+# Cookbook:: spamassassin

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,15 +20,21 @@
 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 "755"
+end
+

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

-  mode 0644
+  mode "644"

   notifies :restart, "service[spamassassin]"
 end
 
   notifies :restart, "service[spamassassin]"
 end
 


@@ -36,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|
 
 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"
   owner "root"
   group "root"
 
 template "/etc/spamassassin/local.cf" do
   source "local.cf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

   variables :trusted_networks => trusted_networks.sort
   notifies :restart, "service[spamassassin]"
 end
   variables :trusted_networks => trusted_networks.sort
   notifies :restart, "service[spamassassin]"
 end