From bdd668242ccb1695dbba0c3267a7fee6a5565d5c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 27 Aug 2014 22:58:23 +0100 Subject: [PATCH] Improve handling of spamassassin state files --- cookbooks/spamassassin/recipes/default.rb | 1 - cookbooks/spamassassin/templates/default/local.cf.erb | 3 +++ cookbooks/spamassassin/templates/default/spamassassin.erb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb index 1326b0213..bbea0159b 100644 --- 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 be8b7736a..df5c021ae 100644 --- 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 1a48d398c..e64c19be9 100644 --- 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 -- 2.43.2