Commit 89ffd71b authored by Lars Beckers's avatar Lars Beckers

Merge branch 'reapply-fixes' into 'master'

Reapply fixes

See merge request !1
parents f90eb55d 371d9f5b
......@@ -29,3 +29,4 @@ dovecot_dsync_host_attribute: ansible_host
dovecot_content_filter: false
dovecot_spam_folder: Spam
dovecot_spam_user: "${1}" # debian-spamd
......@@ -51,7 +51,7 @@
template:
src: "sieve/{{ item }}.j2"
dest: "/var/lib/dovecot/sieve.d/{{ item }}"
mode: '0550'
mode: '0640'
owner: dovecot
group: "{{ dovecot_users_group }}"
with_items:
......@@ -66,9 +66,28 @@
- spamassassin
- mail
- meta: flush_handlers
- name: ensure the global spam filter and learning sieve script have correct permissions
file:
state: file
path: "/var/lib/dovecot/sieve.d/{{ item }}"
mode: '0640'
owner: dovecot
group: "{{ dovecot_users_group }}"
with_items:
- filter-spam.svbin
- report-spam.svbin
- report-ham.svbin
when: dovecot_content_filter
tags:
- dovecot
- spamassassin
- mail
- name: ensure scripts for learning spam are present
copy:
src: "{{ item }}"
template:
src: "{{ item }}.j2"
dest: "/var/lib/dovecot/sieve.d/{{ item }}"
mode: '0750'
owner: dovecot
......
#!/bin/sh
# you can also use tcp/ip here, consult spamc(1)
exec /usr/bin/spamc -u ${1} -L ham -C report
exec /usr/bin/spamc -u {{ dovecot_spam_user }} -L ham -C report
#!/bin/sh
# you can also use tcp/ip here, consult spamc(1)
exec /usr/bin/spamc -u ${1} -L spam -C report
exec /usr/bin/spamc -u {{ dovecot_spam_user }} -L spam -C report
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment