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).

4 files changed, 5 insertions, 5 deletions

diff --git a/roles/IMAP/files/etc/dovecot/dovecot-ldap-userdb.conf.ext b/roles/IMAP/files/etc/dovecot/dovecot-ldap-userdb.conf.ext
index 6c39bf6..c455c07 100644
--- a/roles/IMAP/files/etc/dovecot/dovecot-ldap-userdb.conf.ext
+++ b/roles/IMAP/files/etc/dovecot/dovecot-ldap-userdb.conf.ext
@@ -36,41 +36,41 @@ sasl_mech = EXTERNAL
 #tls_cipher_suite =
 # TLS cert/key is used only if LDAP server requires a client certificate.
 #tls_cert_file =
 #tls_key_file =
 # Valid values: never, hard, demand, allow, try
 #tls_require_cert =
 
 # Use the given ldaprc path.
 #ldaprc_path =
 
 # LDAP library debug level as specified by LDAP_DEBUG_* in ldap_log.h.
 # -1 = everything. You may need to recompile OpenLDAP with debugging enabled
 # to get enough output.
 #debug_level = 0
 
 # LDAP protocol version to use. Likely 2 or 3.
 ldap_version = 3
 
 # LDAP base. %variables can be used here.
 # For example: dc=mail, dc=example, dc=org
-base = fvl=%n,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+base = fvl=%n,fvd=%d,ou=virtual,dc=fripost,dc=org
 
 # Dereference: never, searching, finding, always
 deref = never
 
 # Search scope: base, onelevel, subtree
 scope = base
 
 # User attributes are given in LDAP-name=dovecot-internal-name list. The
 # internal names are:
 #   uid - System UID
 #   gid - System GID
 #   home - Home directory
 #   mail - Mail location
 #
 # There are also other special fields which can be returned, see
 # http://wiki2.dovecot.org/UserDatabase/ExtraFields
 user_attrs = =mail_plugins=antispam
 
 # Filter for user lookup. Some variables can be used (see
 # http://wiki2.dovecot.org/Variables for full list):
diff --git a/roles/IMAP/files/etc/dovecot/dovecot-ldap.conf.ext b/roles/IMAP/files/etc/dovecot/dovecot-ldap.conf.ext
index 77edba8..1ffa73d 100644
--- a/roles/IMAP/files/etc/dovecot/dovecot-ldap.conf.ext
+++ b/roles/IMAP/files/etc/dovecot/dovecot-ldap.conf.ext
@@ -63,48 +63,48 @@ uris = ldapi://
 # logging into LDAP server using the username and password given by client.
 # The pass_filter is used to find the DN for the user. Note that the pass_attrs
 # is still used, only the password field is ignored in it. Before doing any
 # search, the binding is switched back to the default DN.
 auth_bind = yes
 
 # If authentication binding is used, you can save one LDAP request per login
 # if users' DN can be specified with a common template. The template can use
 # the standard %variables (see user_filter). Note that you can't
 # use any pass_attrs if you use this setting.
 #
 # If you use this setting, it's a good idea to use a different
 # dovecot-ldap.conf.ext for userdb (it can even be a symlink, just as long as
 # the filename is different in userdb's args). That way one connection is used
 # only for LDAP binds and another connection is used for user lookups.
 # Otherwise the binding is changed to the default DN before each user lookup.
 #
 # For example:
 #   auth_bind_userdn = cn=%u,ou=people,o=org
 #
-auth_bind_userdn = fvl=%n,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+auth_bind_userdn = fvl=%n,fvd=%d,ou=virtual,dc=fripost,dc=org
 
 # LDAP protocol version to use. Likely 2 or 3.
 ldap_version = 3
 
 # LDAP base. %variables can be used here.
 # For example: dc=mail, dc=example, dc=org
-base = fvl=%n,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+base = fvl=%n,fvd=%d,ou=virtual,dc=fripost,dc=org
 
 # Dereference: never, searching, finding, always
 deref = never
 
 # Search scope: base, onelevel, subtree
 scope = base
 
 # User attributes are given in LDAP-name=dovecot-internal-name list. The
 # internal names are:
 #   uid - System UID
 #   gid - System GID
 #   home - Home directory
 #   mail - Mail location
 #
 # There are also other special fields which can be returned, see
 # http://wiki2.dovecot.org/UserDatabase/ExtraFields
 user_attrs =
 
 # Filter for user lookup. Some variables can be used (see
 # http://wiki2.dovecot.org/Variables for full list):
diff --git a/roles/IMAP/files/etc/postfix/virtual/mailbox.cf b/roles/IMAP/files/etc/postfix/virtual/mailbox.cf
index 009dd98..e69343b 100644
--- a/roles/IMAP/files/etc/postfix/virtual/mailbox.cf
+++ b/roles/IMAP/files/etc/postfix/virtual/mailbox.cf
@@ -1,9 +1,9 @@
 server_host      = ldapi://%2Fprivate%2Fldapi/
 version          = 3
-search_base      = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+search_base      = fvl=%u,fvd=%d,ou=virtual,dc=fripost,dc=org
 domain           = static:all
 scope            = base
 bind             = none
 query_filter     = (&(objectClass=FripostVirtualUser)(fvl=%u))
 result_attribute = fvl
 result_format    = OK
diff --git a/roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf b/roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf
index b082f69..642b722 100644
--- a/roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf
+++ b/roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf
@@ -1,9 +1,9 @@
 server_host      = ldapi://%2Fprivate%2Fldapi/
 version          = 3
-search_base      = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+search_base      = fvl=%u,fvd=%d,ou=virtual,dc=fripost,dc=org
 domain           = static:all
 scope            = base
 bind             = none
 query_filter     = (&(objectClass=FripostVirtualUser)(objectClass=AmavisAccount)(fvl=%u))
 result_attribute = fvl
 result_format    = amavisfeed:[127.0.0.1]:10041