From 2dfe29dfcd35fae7160178e329fb0647cc896e3b Mon Sep 17 00:00:00 2001 From: Guilhem Moulin 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). --- roles/IMAP/files/etc/dovecot/dovecot-ldap-userdb.conf.ext | 2 +- roles/IMAP/files/etc/dovecot/dovecot-ldap.conf.ext | 4 ++-- roles/IMAP/files/etc/postfix/virtual/mailbox.cf | 2 +- roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'roles/IMAP/files/etc') 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 @@ -53,7 +53,7 @@ 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 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 @@ -80,14 +80,14 @@ auth_bind = yes # 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 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,6 +1,6 @@ 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 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,6 +1,6 @@ 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 -- cgit v1.2.3