From 2dfe29dfcd35fae7160178e329fb0647cc896e3b Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 7 Jul 2014 18:37:30 +0200
Subject: Remove o=mailHosting from the LDAP directory suffix.

So our suffix is now a mere 'dc=fripost,dc=org'.  We're also using the
default '/var/lib/ldap' as olcDbDirectory (hence we don't clear it
before hand).
---
 .../templates/usr/share/roundcube/plugins/password/config.inc.php.j2  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'roles/webmail/templates/usr/share/roundcube')

diff --git a/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2 b/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2
index a661909..06f1556 100644
--- a/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2
+++ b/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2
@@ -45,7 +45,7 @@ $rcmail_config['password_ldap_version'] = '3';
 
 // LDAP base name (root directory)
 // Exemple: 'dc=exemple,dc=com'
-$rcmail_config['password_ldap_basedn'] = 'ou=virtual,o=mailHosting,dc=fripost,dc=org';
+$rcmail_config['password_ldap_basedn'] = 'ou=virtual,dc=fripost,dc=org';
 
 // LDAP connection method
 // There is two connection method for changing a user's LDAP password.
@@ -72,7 +72,7 @@ $rcmail_config['password_ldap_adminPW'] = null;
 // '%domain' will be replaced by the current roundcube user's domain part
 // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
 // Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
-$rcmail_config['password_ldap_userDN_mask'] = 'fvl=%name,fvd=%domain,ou=virtual,o=mailHosting,dc=fripost,dc=org';
+$rcmail_config['password_ldap_userDN_mask'] = 'fvl=%name,fvd=%domain,ou=virtual,dc=fripost,dc=org';
 
 // LDAP search DN
 // The DN roundcube should bind with to find out user's DN
-- 
cgit v1.2.3