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

1 files changed, 1 insertions, 1 deletions

diff --git a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
index 200ce90..3595331 100644
--- a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
+++ b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
@@ -62,41 +62,41 @@ $signed_header_fields{received} = 0;
 
 
 # A couple of common banned rules one might can refer by their name
 %banned_rules = (
   'NO-MS-EXEC'=> new_RE( qr/^\.exe-ms$/ ),
   'PASSALL'   => new_RE( [qr/^/ => 0] ),
   'ALLOW_EXE' => new_RE( qr/.\.(vbs|pif|scr|bat)$/i, [qr/^\.exe$/ => 0] ),
   'ALLOW_VBS' => new_RE( [qr/.\.vbs$/ => 0] ),
 );
 
 
 {% if 'MDA' in group_names %}
 $enable_ldap  = 1; # Load Net::LDAP
 $default_ldap = {
     hostname      => 'ldapi://',
     sasl          => 1,
     sasl_mech     => 'EXTERNAL',
     deref         => 'never',
     timeout       => 5,
     scope         => 'one',
-    base          => 'fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org',
+    base          => 'fvd=%d,ou=virtual,dc=fripost,dc=org',
     # XXX: ideally we would use %u in the base and the query_filter, but
     # it's not supported as of amavis 2.7 (see the 'lookup_ldap'
     # subroutine in /usr/sbin/amavisd-new)
     query_filter  => '(&(objectClass=amavisAccount)(ObjectClass=FripostVirtualUser)(fvl=%m))'
 };
 {% endif %}
 
 
 # http://www.ijs.si/software/amavisd/amavisd-new-docs.html#pbanks-ex
 
 $protocol = 'LMTP';
 $inet_socket_port = [];
 
 {% if 'out' in group_names %}
 push @$inet_socket_port, 10040;
 $interface_policy{'10040'} = 'OUTGOING';
 {% endif %}
 {% if 'MDA' in group_names %}
 push @$inet_socket_port, 10041;
 $interface_policy{'10041'} = 'INCOMING';