diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-07-09 03:38:53 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:52:50 +0200 |
| commit | 508fa5dad16a62630b3063a4d0b395b0ca6ae005 (patch) | |
| tree | db23a6f2f0f38e7cf3c4e276e660f991bda1b6a6 /roles | |
| parent | 55e9b2a0ebc87a353f9c9496a77b313e41e47bd4 (diff) | |
Fix Dovecot's mail location.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/IMAP/files/etc/dovecot/conf.d/20-imap.conf | 2 | ||||
| -rw-r--r-- | roles/IMAP/files/etc/dovecot/conf.d/auth-ldap.conf.ext | 4 | ||||
| -rw-r--r-- | roles/IMAP/tasks/imap.yml | 8 | ||||
| -rw-r--r-- | roles/common/templates/etc/iptables/services.j2 | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/roles/IMAP/files/etc/dovecot/conf.d/20-imap.conf b/roles/IMAP/files/etc/dovecot/conf.d/20-imap.conf index fa127c6..2557b78 100644 --- a/roles/IMAP/files/etc/dovecot/conf.d/20-imap.conf +++ b/roles/IMAP/files/etc/dovecot/conf.d/20-imap.conf @@ -63,6 +63,6 @@ protocol imap { args = /etc/dovecot/dovecot-ldap-userdb.conf.ext # Default fields can be used to specify defaults that LDAP may override - default_fields = home=/home/mail/%d/%n + default_fields = home=/home/mail/virtual/%d/%n } } diff --git a/roles/IMAP/files/etc/dovecot/conf.d/auth-ldap.conf.ext b/roles/IMAP/files/etc/dovecot/conf.d/auth-ldap.conf.ext index 0b38f00..5237fc2 100644 --- a/roles/IMAP/files/etc/dovecot/conf.d/auth-ldap.conf.ext +++ b/roles/IMAP/files/etc/dovecot/conf.d/auth-ldap.conf.ext @@ -24,7 +24,7 @@ passdb { # args = /etc/dovecot/dovecot-ldap-userdb.conf.ext # # # Default fields can be used to specify defaults that LDAP may override -# default_fields = home=/home/mail/%d/%n +# default_fields = home=/home/mail/virtual/%d/%n #} # If you don't have any user-specific settings, you can avoid the userdb LDAP @@ -35,5 +35,5 @@ userdb { # The MTA has already verified the existence of users when doing alias resolution, # so we can skip the passdb lookup here. - args = home=/home/mail/%d/%n allow_all_users=yes + args = home=/home/mail/virtual/%d/%n allow_all_users=yes } diff --git a/roles/IMAP/tasks/imap.yml b/roles/IMAP/tasks/imap.yml index 25f876d..b142ba6 100644 --- a/roles/IMAP/tasks/imap.yml +++ b/roles/IMAP/tasks/imap.yml @@ -33,6 +33,12 @@ owner=root group=root mode=0755 +- name: Create /home/mail/virtual + file: path=/home/mail/virtual + state=directory + owner=vmail group=vmail + mode=0700 + - name: Create virtual mailbox directories file: path=/etc/dovecot/virtual/{{ item }} state=directory @@ -56,8 +62,6 @@ - unseen - name: Create directory /home/mail/spamspool - # There is no possibility for a name clash, since 'spamspool' isn't a - # valid domain file: path=/home/mail/spamspool state=directory owner=vmail group=vmail diff --git a/roles/common/templates/etc/iptables/services.j2 b/roles/common/templates/etc/iptables/services.j2 index d24b55d..c2ba3d0 100644 --- a/roles/common/templates/etc/iptables/services.j2 +++ b/roles/common/templates/etc/iptables/services.j2 @@ -41,6 +41,6 @@ in tcp 587 # SMTP-AUTH {% endif %} {% if 'webmail' in group_names %} in tcp 80,443 # HTTP/HTTPS -out tcp 993 # IMAP # TODO imapc +out tcp 993 # IMAP out tcp 4190 {% endif %} |