# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1392159328 0
# Node ID 19486a140ef521569c514788c4d3d827f74e42eb
# Parent  65a29a373c19a30313c1b83051390913a6c64397
VMM/config: Updated default values for Dovecot ≥ 2.0.0

Renamed bin.dovecotpw -> bin.doveadm; default: /usr/bin/doveadm
Updated domain.transport to lmtp:unix:private/dovecot-lmtp

diff -r 65a29a373c19 -r 19486a140ef5 VirtualMailManager/config.py
--- a/VirtualMailManager/config.py	Mon Feb 10 22:54:43 2014 +0000
+++ b/VirtualMailManager/config.py	Tue Feb 11 22:55:28 2014 +0000
@@ -306,8 +306,7 @@
                 'random_password': LCO(bool_t, False, self.getboolean),
             },
             'bin': {
-                'dovecotpw': LCO(str, '/usr/sbin/dovecotpw', self.get,
-                                 exec_ok),
+                'doveadm': LCO(str, '/usr/bin/doveadm', self.get, exec_ok),
                 'du': LCO(str, '/usr/bin/du', self.get, exec_ok),
                 'postconf': LCO(str, '/usr/sbin/postconf', self.get, exec_ok),
             },
@@ -331,11 +330,11 @@
                 'quota_bytes': LCO(str, '0', self.get_in_bytes,
                                    check_size_value),
                 'quota_messages': LCO(int, 0, self.getint),
-                'transport': LCO(str, 'dovecot:', self.get),
+                'transport': LCO(str, 'lmtp:unix:private/dovecot-lmtp',
+                                 self.get),
             },
             'mailbox': {
-                'folders': LCO(str, 'Drafts:Sent:Templates:Trash',
-                               self.str),
+                'folders': LCO(str, 'Drafts:Sent:Templates:Trash', self.str),
                 'format': LCO(str, 'maildir', self.get, check_mailbox_format),
                 'root': LCO(str, 'Maildir', self.str),
                 'subscribe': LCO(bool_t, True, self.getboolean),