aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/postfix/tasks/main.yml2
-rw-r--r--ansible/roles/spamassassin/tasks/main.yml10
2 files changed, 2 insertions, 10 deletions
diff --git a/ansible/roles/postfix/tasks/main.yml b/ansible/roles/postfix/tasks/main.yml
index f647c24..b35c924 100644
--- a/ansible/roles/postfix/tasks/main.yml
+++ b/ansible/roles/postfix/tasks/main.yml
@@ -176,7 +176,7 @@
# spamassassin filtering
spamassassin unix - n n - - pipe
- user=spamd argv=/usr/bin/spamc -f -e
+ user=debian-spamd argv=/usr/bin/spamc -f -e
/usr/sbin/sendmail -oi -f ${sender} ${recipient}
# authenticated submission cleanup
diff --git a/ansible/roles/spamassassin/tasks/main.yml b/ansible/roles/spamassassin/tasks/main.yml
index a18c891..4d39946 100644
--- a/ansible/roles/spamassassin/tasks/main.yml
+++ b/ansible/roles/spamassassin/tasks/main.yml
@@ -8,14 +8,6 @@
tags:
- role::spamassassin
-- name: Create spamd user
- user:
- name: spamd
- home: /var/spamd
- comment: "SpamAssassin user"
- tags:
- - role::spamassassin
-
- name: Update spamd defaults
lineinfile:
path: /etc/default/spamd
@@ -30,7 +22,7 @@
- key: AHOME
value: "/var/log/spamassassin/"
- key: OPTIONS
- value: "--create-prefs --max-children 5 --username spamd --helper-home-dir /var/spamd/ -s /var/spamd/spamd.log --allow-tell"
+ value: "--create-prefs --max-children 5 --username debian-spamd --helper-home-dir /var/lib/spamassassin/ -s /var/log/spamd.log --allow-tell"
- key: CRON
value: "1"
tags: