From: Grant Slater <git@firefishy.com>
Date: Mon, 25 Aug 2014 11:57:59 +0000 (+0100)
Subject: spamassassin: Add virtual home
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/121121d81991ae8af9e9ec0ff45a0b77a8c48543

spamassassin: Add virtual home
---

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index e9150a55d..1326b0213 100644
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -24,6 +24,13 @@ service "spamassassin" do
   supports :status => true, :restart => true, :reload => true
 end
 
+directory "/var/spool/spamassassin" do
+  owner "mail"
+  group "mail"
+  mode 0755
+  action :create
+end
+
 template "/etc/default/spamassassin" do
   source "spamassassin.erb"
   owner "root"
diff --git a/cookbooks/spamassassin/templates/default/spamassassin.erb b/cookbooks/spamassassin/templates/default/spamassassin.erb
index e64c19be9..1a48d398c 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"
+OPTIONS="--username mail --nouser-config --virtual-config-dir=/var/spool/spamassassin"
 
 # Pid file
 # Where should spamd write its PID to file? If you use the -u or