From 70a3afdb2dd9175fbc7e7f8f155bca25e92fe42c Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Sun, 9 Dec 2012 10:57:07 +0000 Subject: Set the default username_domain so that users can login with mail and alias localparts --- pykolab/setup/setup_roundcube.py | 1 + share/templates/roundcubemail/main.inc.php.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py index 5eed26c..1c1c60c 100644 --- a/pykolab/setup/setup_roundcube.py +++ b/pykolab/setup/setup_roundcube.py @@ -81,6 +81,7 @@ def execute(*args, **kw): 'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'), 'ldap_user_base_dn': conf.get('ldap', 'user_base_dn'), 'ldap_user_filter': conf.get('ldap', 'user_filter'), + 'primary_domain': conf.get('kolab','primary_domain'), 'mysql_uri': 'mysqli://roundcube:%s@localhost/roundcube' % (mysql_roundcube_password), 'conf': conf } diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl index 89068ff..9e4d14f 100644 --- a/share/templates/roundcubemail/main.inc.php.tpl +++ b/share/templates/roundcubemail/main.inc.php.tpl @@ -195,7 +195,7 @@ \$rcmail_config['smtp_server'] = 'tls://localhost'; \$rcmail_config['session_domain'] = ''; \$rcmail_config['des_key'] = "$des_key"; - \$rcmail_config['username_domain'] = ''; + \$rcmail_config['username_domain'] = '$primary_domain'; \$rcmail_config['mail_domain'] = ''; -- cgit v1.1