diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-04-27 14:22:33 (GMT) |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-04-27 14:22:33 (GMT) |
| commit | 5d2036cd7d3ecb6d44ed1a54f4835fb85a067696 (patch) | |
| tree | b1a57cb2b30d462146f869ed5c847ac3d51bf83a /pykolab | |
| parent | 1ab25276c9b0425ac638ab0935a8c5d30d699048 (diff) | |
| download | pykolab-5d2036cd7d3ecb6d44ed1a54f4835fb85a067696.tar.gz | |
Use the configured administrator login
Correct some of the options set in /etc/imapd.conf
Diffstat (limited to 'pykolab')
| -rw-r--r-- | pykolab/setup/setup_imap.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pykolab/setup/setup_imap.py b/pykolab/setup/setup_imap.py index 683b4a4..a7c4810 100644 --- a/pykolab/setup/setup_imap.py +++ b/pykolab/setup/setup_imap.py @@ -50,10 +50,10 @@ def execute(*args, **kw): "pts_module": "ldap", "ldap_servers": conf.get('ldap', 'ldap_uri'), "ldap_sasl": "0", - "ldap_base_dn": conf.get('ldap', 'base_dn'), + "ldap_base": conf.get('ldap', 'base_dn'), "ldap_bind_dn": conf.get('ldap', 'service_bind_dn'), "ldap_password": conf.get('ldap', 'service_bind_pw'), - "ldap_filter": '(|(&(|(uid=cyrus-admin)(uid=cyrus-murder))(uid=%U))(&(|(uid=%U)(mail=%U@%d)(mail=%U@%r))(objectclass=kolabinetorgperson)))', + "ldap_filter": '(|(&(|(uid=%s)(uid=cyrus-murder))(uid=%%U))(&(|(uid=%%U)(mail=%%U@%%d)(mail=%%U@%%r))(objectclass=kolabinetorgperson)))' % (conf.get('cyrus-imap', 'admin_login')), "ldap_user_attribute": conf.get('cyrus-sasl', 'result_attribute'), "ldap_group_base": conf.get('ldap', 'base_dn'), "ldap_group_filter": "(&(cn=%u)(objectclass=ldapsubentry)(objectclass=nsroledefinition))", @@ -66,7 +66,7 @@ def execute(*args, **kw): "ldap_time_limit": "10", "unixhierarchysep": "1", "virt_domains": "userid", - "admins": "cyrus-admin", + "admins": conf.get('cyrus-imap', 'admin_login'), "annotation_definitions": "/etc/imapd.annotations.conf", "sieve_extensions": "fileinto reject vacation imapflags notify envelope include relational regex subaddress copy", "allowallsubscribe": "0", @@ -79,13 +79,13 @@ def execute(*args, **kw): "sieve_allowreferrals": "0", "lmtp_downcase_rcpt": "1", "lmtp_fuzzy_mailbox_match": "1", - "username_to_lower": "1", - "normalizeuid": "1", + "username_tolower": "1", + #"normalizeuid": "1", "deletedprefix": "DELETED", "delete_mode": "delayed", "expunge_mode": "delayed", "flushseenstate": "1", - "virt_domains": "userid", + "virtdomains": "userid", } myaugeas = Augeas() |