From: Tom Hughes <tom@compton.nu>
Date: Sat, 6 Sep 2014 09:59:44 +0000 (+0100)
Subject: Run spamassassin as debian-spamd
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/47de5772657bc8ab28e7c1aae082f0d25cd045e8

Run spamassassin as debian-spamd
---

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index bbea0159b..6c64083b8 100644
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -25,8 +25,8 @@ service "spamassassin" do
 end
 
 directory "/var/spool/spamassassin" do
-  owner "mail"
-  group "mail"
+  owner "debian-spamd"
+  group "debian-spamd"
   mode 0755
 end
 
diff --git a/cookbooks/spamassassin/templates/default/spamassassin.erb b/cookbooks/spamassassin/templates/default/spamassassin.erb
index e64c19be9..286d1feeb 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 debian-spamd --nouser-config"
 
 # Pid file
 # Where should spamd write its PID to file? If you use the -u or