projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ee7864
)
Improve handling of spamassassin state files
author
Tom Hughes
<tom@compton.nu>
Wed, 27 Aug 2014 21:58:23 +0000
(22:58 +0100)
committer
Tom Hughes
<tom@compton.nu>
Wed, 27 Aug 2014 21:58:23 +0000
(22:58 +0100)
cookbooks/spamassassin/recipes/default.rb
patch
|
blob
|
history
cookbooks/spamassassin/templates/default/local.cf.erb
patch
|
blob
|
history
cookbooks/spamassassin/templates/default/spamassassin.erb
patch
|
blob
|
history
diff --git
a/cookbooks/spamassassin/recipes/default.rb
b/cookbooks/spamassassin/recipes/default.rb
index 1326b02135d7d9c21ec69fbe5986c8f306e45fe1..bbea0159b597bdfad7682fdd2015d6aa77507cae 100644
(file)
--- a/
cookbooks/spamassassin/recipes/default.rb
+++ b/
cookbooks/spamassassin/recipes/default.rb
@@
-28,7
+28,6
@@
directory "/var/spool/spamassassin" do
owner "mail"
group "mail"
mode 0755
- action :create
end
template "/etc/default/spamassassin" do
diff --git
a/cookbooks/spamassassin/templates/default/local.cf.erb
b/cookbooks/spamassassin/templates/default/local.cf.erb
index be8b7736abe103c2be0c3a89520af4e53cc74303..df5c021ae23fe0320d2da5beffea336b3fcb74fd 100644
(file)
--- a/
cookbooks/spamassassin/templates/default/local.cf.erb
+++ b/
cookbooks/spamassassin/templates/default/local.cf.erb
@@
-5,3
+5,6
@@
required_score 5.0
# Set which networks or hosts are considered 'trusted'
trusted_networks <%= @trusted_networks.join(" ") %>
+
+# Set the location for our state files
+bayes_path /var/spool/spamassassin/bayes
diff --git
a/cookbooks/spamassassin/templates/default/spamassassin.erb
b/cookbooks/spamassassin/templates/default/spamassassin.erb
index 1a48d398cb6d0070f28101cd3f95bdf52ef43dea..e64c19be99ecfaa814c51a1385173db5be80d948 100644
(file)
--- a/
cookbooks/spamassassin/templates/default/spamassassin.erb
+++ b/
cookbooks/spamassassin/templates/default/spamassassin.erb
@@
-10,7
+10,7
@@
ENABLED=1
# make sure --max-children is not set to anything higher than 5,
# unless you know what you're doing.
-OPTIONS="--username mail --nouser-config
--virtual-config-dir=/var/spool/spamassassin
"
+OPTIONS="--username mail --nouser-config"
# Pid file
# Where should spamd write its PID to file? If you use the -u or