1 files changed, 12 insertions, 8 deletions

diff --git a/roles/IMAP/tasks/imap.yml b/roles/IMAP/tasks/imap.yml
index 51e7694..f4a23e4 100644
--- a/roles/IMAP/tasks/imap.yml
+++ b/roles/IMAP/tasks/imap.yml
@@ -19,74 +19,78 @@
 
 ## TODO: make a LDAP query listing all users using iterate_attrs and
 ## iterate_filter.  (Alternatively, use a dict, see
 ## https://www.opensource.apple.com/source/dovecot/dovecot-293/dovecot.Config/dovecot-dict-auth.conf.ext)
 ## Required for dbox, see
 ## http://wiki2.dovecot.org/MailboxFormat/dbox#Multi-dbox
 #- name: Create a nightly cron job to purge expunged messages
 #  cron: name="Purge expunged messages"
 #        minute=7 hour=5
 #        user=vmail cron_file=doveadm-purge
 #        job="/usr/bin/doveadm purge -A"
 
 # The ownership and permissions ensure that dovecot won't try to
 # deliver mails under an umounted mountpoint.
 - name: Create a home directory for user 'vmail'
   file: path=/home/mail
         state=directory
         owner=root group=root
         mode=0755
 
-- name: Create /home/mail/virtual
-  file: path=/home/mail/virtual
+- name: Create /home/mail/{virtual,attachments,spamspool}
+  file: path=/home/mail/{{ item }}
         state=directory
         owner=vmail group=vmail
         mode=0700
+  with_items:
+    - virtual
+    - attachments
+    - spamspool
+
+- name: Create a cronjob for SIS deduplication
+  copy: src=etc/cron.d/doveadm
+        dest=/etc/cron.d/doveadm
+        owner=root group=root
+        mode=0644
 
 - name: Create virtual mailbox directories
   file: path=/etc/dovecot/virtual/{{ item }}
         state=directory
         owner=root group=root
         mode=0755
   with_items:
     - all
     - flagged
     - recent
     - unseen
 
 - name: Create virtual mailboxes
   copy: src=etc/dovecot/virtual/{{ item }}/dovecot-virtual
         dest=/etc/dovecot/virtual/{{ item }}/dovecot-virtual
         owner=root group=root
         mode=0644
   with_items:
     - all
     - flagged
     - recent
     - unseen
 
-- name: Create directory /home/mail/spamspool
-  file: path=/home/mail/spamspool
-        state=directory
-        owner=vmail group=vmail
-        mode=0700
-
 - name: Create directory /etc/dovecot/ssl
   file: path=/etc/dovecot/ssl
         state=directory
         owner=root group=root
         mode=0755
 
 
 - name: Fetch Dovecot's X.509 certificate
   # Ensure we don't fetch private data
   become: False
   fetch_cmd: cmd="openssl x509 -noout -pubkey"
              stdin=/etc/dovecot/ssl/imap.fripost.org.pem
              dest=certs/public/imap.fripost.org.pub
   tags:
     - genkey
 
 - name: Configure Dovecot
   copy: src=etc/dovecot/{{ item }}
         dest=/etc/dovecot/{{ item }}
         owner=root group=root