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

7 files changed, 7 insertions, 7 deletions

diff --git a/roles/MX/files/usr/local/sbin/reserved-alias.pl b/roles/MX/files/usr/local/sbin/reserved-alias.pl
index 603d773..517e51b 100755
--- a/roles/MX/files/usr/local/sbin/reserved-alias.pl
+++ b/roles/MX/files/usr/local/sbin/reserved-alias.pl
@@ -50,41 +50,41 @@ my @recipients = grep { $_ and $orig ne $_ }
                  # add localparts to domain
                  map { my $x = $_;
                        if ($x =~ /^\@/) {
                          $x = (defined $local and $local ne '') ? $local.$x : undef;
                        }
                        $x
                      }
                  @ARGV;
 # Die if we can't deliver to site admins
 die "Error: Aborted delivery to '$orig' in attempt to break an alias expansion loop.\n"
     unless @recipients;
 
 if (defined $domain) {
     # Look for the domain owner or postmaster
     my $ldap = Net::LDAPI->new();
     $ldap->bind( sasl => Authen::SASL->new(mechanism => 'EXTERNAL') )
         or die "Error: Couldn't bind";
 
     my @attrs = ( 'fripostPostmaster', 'fripostOwner' );
     my $mesg = $ldap->search( base => 'fvd='.escape_dn_value($domain).','
-                                     .'ou=virtual,o=mailHosting,dc=fripost,dc=org'
+                                     .'ou=virtual,dc=fripost,dc=org'
                             , scope => 'base'
                             , deref => 'never'
                             , filter => '(&(objectClass=FripostVirtualDomain)'
                                          .'(fvd='.escape_filter_value($domain).')'.
                                         ')'
                             , attrs => \@attrs
                             );
     if ($mesg->code) {
         warn "Warning: ".$mesg->error;
     }
     elsif ($mesg->count != 1) {
         # Note: this may happen for "$mydestination", but these mails
         # are unlikely. We'll get a harmless warning at worst.
         warn "Warning: Something weird happened when looking up domain '".$domain.
              "'. Check your ACL.";
     }
     else {
         my $entry = $mesg->pop_entry() // die "Error: Cannot pop entry.";
         foreach (@attrs) {
             my $v = $entry->get_value($_, asref => 1) or next;
diff --git a/roles/MX/templates/etc/postfix/virtual/alias.cf.j2 b/roles/MX/templates/etc/postfix/virtual/alias.cf.j2
index c7d2f0a..2e80d45 100644
--- a/roles/MX/templates/etc/postfix/virtual/alias.cf.j2
+++ b/roles/MX/templates/etc/postfix/virtual/alias.cf.j2
@@ -1,8 +1,8 @@
 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=FripostVirtualAlias)(fvl=%u))
 result_attribute = fripostMaildrop
diff --git a/roles/MX/templates/etc/postfix/virtual/alias_domains.cf.j2 b/roles/MX/templates/etc/postfix/virtual/alias_domains.cf.j2
index dec8bce..bdfa802 100644
--- a/roles/MX/templates/etc/postfix/virtual/alias_domains.cf.j2
+++ b/roles/MX/templates/etc/postfix/virtual/alias_domains.cf.j2
@@ -1,9 +1,9 @@
 server_host      = ldapi://%2Fprivate%2Fldapi/
 version          = 3
-search_base      = fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+search_base      = fvd=%d,ou=virtual,dc=fripost,dc=org
 domain           = static:all
 scope            = base
 bind             = none
 query_filter     = (&(objectClass=FripostVirtualAliasDomain)(fvd=%d))
 result_attribute = fripostMaildrop
 result_format    = %U@%s
diff --git a/roles/MX/templates/etc/postfix/virtual/catchall.cf.j2 b/roles/MX/templates/etc/postfix/virtual/catchall.cf.j2
index 8ac40fd..398e530 100644
--- a/roles/MX/templates/etc/postfix/virtual/catchall.cf.j2
+++ b/roles/MX/templates/etc/postfix/virtual/catchall.cf.j2
@@ -1,8 +1,8 @@
 server_host      = ldapi://%2Fprivate%2Fldapi/
 version          = 3
-search_base      = fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+search_base      = fvd=%d,ou=virtual,dc=fripost,dc=org
 domain           = static:all
 scope            = base
 bind             = none
 query_filter     = (&(objectClass=FripostVirtualDomain)(!(objectClass=FripostVirtualAliasDomain))(fvd=%d)(fripostOptionalMaildrop=*))
 result_attribute = fripostOptionalMaildrop
diff --git a/roles/MX/templates/etc/postfix/virtual/list.cf.j2 b/roles/MX/templates/etc/postfix/virtual/list.cf.j2
index 5988159..4020b42 100644
--- a/roles/MX/templates/etc/postfix/virtual/list.cf.j2
+++ b/roles/MX/templates/etc/postfix/virtual/list.cf.j2
@@ -1,11 +1,11 @@
 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=FripostVirtualList)(fvl=%u))
 result_attribute = fvl
 # Use a dedicated "virtual" domain to decongestion potential bottlenecks
 # on trivial_rewrite(8) due to slow LDAP lookups in tranport_maps.
 result_format    = %D/%U@lists.fripost.org
diff --git a/roles/MX/templates/etc/postfix/virtual/mailbox.cf.j2 b/roles/MX/templates/etc/postfix/virtual/mailbox.cf.j2
index a108c0d..118e17a 100644
--- a/roles/MX/templates/etc/postfix/virtual/mailbox.cf.j2
+++ b/roles/MX/templates/etc/postfix/virtual/mailbox.cf.j2
@@ -1,11 +1,11 @@
 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
 # Use a dedicated "virtual" domain to decongestion potential bottlenecks
 # on trivial_rewrite(8) due to slow LDAP lookups in tranport_maps.
 result_format    = %D/%U@mda.fripost.org
diff --git a/roles/MX/templates/etc/postfix/virtual/mailbox_domains.cf.j2 b/roles/MX/templates/etc/postfix/virtual/mailbox_domains.cf.j2
index 74304a4..43b7f3a 100644
--- a/roles/MX/templates/etc/postfix/virtual/mailbox_domains.cf.j2
+++ b/roles/MX/templates/etc/postfix/virtual/mailbox_domains.cf.j2
@@ -1,8 +1,8 @@
 server_host      = ldapi://%2Fprivate%2Fldapi/
 version          = 3
-search_base      = fvd=%s,ou=virtual,o=mailHosting,dc=fripost,dc=org
+search_base      = fvd=%s,ou=virtual,dc=fripost,dc=org
 scope            = base
 bind             = none
 query_filter     = (&(objectClass=FripostVirtualDomain)(fvd=%s))
 result_attribute = fvd
 result_format    = OK