Move mail domain directories from data into mail subfolder

roles/mailserver/files/etc_dovecot_conf.d_10-mail.conf

@@ -27,7 +27,7 @@
 #
 # <doc/wiki/MailLocation.txt>
 #
-mail_location = maildir:/data/%d/%n
+mail_location = maildir:/data/mail/%d/%n
 
 # If you need to set multiple mailbox locations or want to change default
 # namespace settings, you can do it by defining namespace sections.

roles/mailserver/files/etc_dovecot_conf.d_auth-sql.conf.ext

@@ -18,7 +18,7 @@ passdb {
 
 userdb {
   driver = static
-  args = uid=vmail gid=vmail home=/data/%d/%n
+  args = uid=vmail gid=vmail home=/data/mail/%d/%n
 }
 
 # If you don't have any user-specific settings, you can avoid the user_query

roles/mailserver/tasks/dovecot.yml

@@ -32,10 +32,18 @@
     home=/data
     shell=/usr/sbin/nologin
 
+- name: Ensure mail directory is in place
+  file:
+    state=directory
+    path=/data/mail
+    owner=vmail
+    group=dovecot
+    mode=0770
+
 - name: Ensure mail domain directories are in place
   file:
     state=directory
-    path=/data/{{ item.name }}
+    path=/data/mail/{{ item.name }}
     owner=vmail
     group=dovecot
     mode=0770
@@ -44,7 +52,7 @@
 - name: Ensure mail directories are in place
   file:
     state=directory
-    path=/data/{{ item.domain }}/{{ item.account }}
+    path=/data/mail/{{ item.domain }}/{{ item.account }}
     owner=vmail
     group=dovecot
   with_items: '{{ mail_virtual_users }}'