aboutsummaryrefslogtreecommitdiffstats
path: root/roles/mail
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2018-03-05 23:53:17 +0800
committerAaron LI <aly@aaronly.me>2018-03-14 11:35:08 +0800
commit2914738172bf67ee15b3f160b92e751afd310b5a (patch)
tree47c7961098e85bf5cff579dba67150fb82ebd3f7 /roles/mail
parent48c30e6deaaa8e16b3a48d549228146db3aba7e1 (diff)
downloadansible-dfly-vps-2914738172bf67ee15b3f160b92e751afd310b5a.tar.bz2
mail/dovecot: simplify "mail_location" set
Diffstat (limited to 'roles/mail')
-rw-r--r--roles/mail/templates/dovecot.conf.j228
1 files changed, 11 insertions, 17 deletions
diff --git a/roles/mail/templates/dovecot.conf.j2 b/roles/mail/templates/dovecot.conf.j2
index 5117796..b1772b5 100644
--- a/roles/mail/templates/dovecot.conf.j2
+++ b/roles/mail/templates/dovecot.conf.j2
@@ -134,21 +134,6 @@ login_log_format_elements = user=<%{orig_user}> method=%m rip=%r lip=%l mpid=%e
## Mailbox settings and mail handling.
##
-# Home directories for virtual users, where Dovecot can save user-specific
-# files. Home directory shouldn't be the same as mail directory with mbox
-# or Maildir formats (but with dbox/obox it's fine).
-mail_home = {{ mail.user.home }}/%d/%n
-
-# Location for users' mailboxes. The default is empty, which means that Dovecot
-# tries to find the mailboxes automatically. This won't work if the user
-# doesn't yet have any mail, so you should explicitly tell Dovecot the full
-# location.
-#
-# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u)
-# isn't enough. You'll also need to tell Dovecot where the other mailboxes are
-# kept. This is called the "root mail directory", and it must be the first
-# path given in the mail_location setting.
-#
# There are a few special variables you can use, eg.:
#
# %u - username
@@ -157,8 +142,17 @@ mail_home = {{ mail.user.home }}/%d/%n
# %h - home directory
#
# See doc/wiki/Variables.txt for full list.
-#
-mail_location = maildir:{{ mail.user.home }}/%d/%n/mail:LAYOUT=fs
+
+# Home directories for virtual users, where Dovecot can save user-specific
+# files. Home directory shouldn't be the same as mail directory with mbox
+# or Maildir formats (but with dbox/obox it's fine).
+mail_home = {{ mail.user.home }}/%d/%n
+
+# Location for users' mailboxes. The default is empty, which means that
+# Dovecot tries to find the mailboxes automatically. This won't work if
+# the user doesn't yet have any mail, so you should explicitly tell
+# Dovecot the full location.
+mail_location = maildir:~/mail:LAYOUT=fs
# System user and group used to access mails. If you use multiple,
# userdb can override these by returning uid or gid fields. You can