Merge branch 'ldap-storage-regression' into 'master'
dovecot: fix storage basedir regression in ldap home See merge request simple-nixos-mailserver/nixos-mailserver!505
This commit is contained in:
@@ -79,7 +79,7 @@ let
|
|||||||
scope = ${mkLdapSearchScope cfg.ldap.scope}
|
scope = ${mkLdapSearchScope cfg.ldap.scope}
|
||||||
user_attrs = \
|
user_attrs = \
|
||||||
${ldapUuidAttribute}=${ldapUuidAttribute}, \
|
${ldapUuidAttribute}=${ldapUuidAttribute}, \
|
||||||
=home=/var/vmail/ldap/%{ldap:${ldapUuidAttribute}}, \
|
=home=${cfg.mailDirectory}/ldap/%{ldap:${ldapUuidAttribute}}, \
|
||||||
=mail=maildir:~/mail${maildirLayoutAppendix}${maildirUTF8FolderNames}${
|
=mail=maildir:~/mail${maildirLayoutAppendix}${maildirUTF8FolderNames}${
|
||||||
lib.optionalString (cfg.indexDir != null) ":INDEX=${cfg.indexDir}/ldap/%{ldap:${ldapUuidAttribute}}"
|
lib.optionalString (cfg.indexDir != null) ":INDEX=${cfg.indexDir}/ldap/%{ldap:${ldapUuidAttribute}}"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ in
|
|||||||
fqdn = "mail.example.com";
|
fqdn = "mail.example.com";
|
||||||
domains = [ "example.com" ];
|
domains = [ "example.com" ];
|
||||||
localDnsResolver = false;
|
localDnsResolver = false;
|
||||||
|
mailDirectory = "/var/lib/dovecot/vmail";
|
||||||
indexDir = "/var/lib/dovecot/indices";
|
indexDir = "/var/lib/dovecot/indices";
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
|
|||||||
Reference in New Issue
Block a user