diff --git a/pykolab/setup/setup_imap.py b/pykolab/setup/setup_imap.py --- a/pykolab/setup/setup_imap.py +++ b/pykolab/setup/setup_imap.py @@ -61,7 +61,7 @@ partition_default = "/var/spool/cyrus/mail/" imapd_settings = { - "ldap_servers": conf.get('ldap', 'ldap_uri'), + "ldap_uri": conf.get('ldap', 'ldap_uri'), "ldap_base": conf.get('ldap', 'base_dn'), "ldap_bind_dn": conf.get('ldap', 'service_bind_dn'), "ldap_password": conf.get('ldap', 'service_bind_pw'), diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl --- a/share/templates/imapd.conf.tpl +++ b/share/templates/imapd.conf.tpl @@ -14,7 +14,7 @@ auth_mech: pts pts_module: ldap ptloader_sock: /var/lib/imap/socket/ptsock -ldap_servers: $ldap_servers +ldap_uri: $ldap_uri ldap_sasl: 0 ldap_base: $ldap_base ldap_bind_dn: $ldap_bind_dn @@ -33,7 +33,7 @@ unixhierarchysep: 1 virtdomains: userid annotation_definitions: /etc/imapd.annotations.conf -sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index +sieve_extensions: fileinto reject envelope body vacation imap4flags notify include regex subaddress relational copy date index allowallsubscribe: 0 allowusermoves: 1 altnamespace: 1