From 94caeae7560bae2be2acc01010f5eabd514b64c5 Mon Sep 17 00:00:00 2001 From: kat witch Date: Fri, 10 Sep 2021 23:45:27 +0100 Subject: [PATCH] services/openldap: Adjust for actually working catchAll --- config/services/openldap/default.nix | 2 +- config/services/openldap/mail.ldif | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/services/openldap/default.nix b/config/services/openldap/default.nix index 3db95905..ed049d0d 100644 --- a/config/services/openldap/default.nix +++ b/config/services/openldap/default.nix @@ -107,7 +107,7 @@ ''(1.3.6.1.4.1.12461.1.2.2 NAME 'mailAlias' SUP top STRUCTURAL DESC 'Mail aliasing/forwarding entry' - MUST ( mail $ mailAcceptingGeneralId $ maildrop ) + MUST ( mail $ maildrop ) MAY ( cn $ description ))'' ''(1.3.6.1.4.1.12461.1.2.3 NAME 'mailDomain' SUP domain STRUCTURAL diff --git a/config/services/openldap/mail.ldif b/config/services/openldap/mail.ldif index 685ebe0d..abd53c15 100644 --- a/config/services/openldap/mail.ldif +++ b/config/services/openldap/mail.ldif @@ -19,6 +19,18 @@ objectClass: top dc: aliases ou: aliases +dn: mail=@kittywit.ch,dc=aliases,dc=mail,dc=eve +objectClass: top +objectClass: mailAlias +mail: @kittywit.ch +maildrop: kat@kittywit.ch + +dn: mail=@dork.dev,dc=aliases,dc=mail,dc=eve +objectClass: top +objectClass: mailAlias +mail: @dork.dev +maildrop: kat@kittywit.ch + dn: dc=domains,dc=mail,dc=kittywit,dc=ch objectClass: dcObject objectClass: organizationalUnit @@ -37,12 +49,3 @@ objectClass: top objectClass: mailDomain dc: dork.dev postfixTransport: virtual: - -dn: mail=kat@kittywit.ch,dc=aliases,dc=mail,dc=kittywit,dc=ch -objectClass: top -objectClass: mailAlias -mailAcceptingGeneralId: kittywit.ch -mailAcceptingGeneralId: @kittywit.ch -maildrop: kat@kittywit.ch - -