dovecot: drop redundant uuid mapping in user_attrs
This was redundant at best and crashing Dovecot at worst, due to multiple requests for the uuid field name. Closes: #352
This commit is contained in:
@@ -61,7 +61,6 @@ let
|
|||||||
|
|
||||||
postfixCfg = config.services.postfix;
|
postfixCfg = config.services.postfix;
|
||||||
|
|
||||||
ldapUuidAttribute = cfg.ldap.attributes.uuid;
|
|
||||||
ldapConfig = pkgs.writeTextFile {
|
ldapConfig = pkgs.writeTextFile {
|
||||||
name = "dovecot-ldap.conf.ext.template";
|
name = "dovecot-ldap.conf.ext.template";
|
||||||
text = ''
|
text = ''
|
||||||
@@ -78,10 +77,11 @@ let
|
|||||||
base = ${cfg.ldap.base}
|
base = ${cfg.ldap.base}
|
||||||
scope = ${mkLdapSearchScope cfg.ldap.scope}
|
scope = ${mkLdapSearchScope cfg.ldap.scope}
|
||||||
user_attrs = \
|
user_attrs = \
|
||||||
${ldapUuidAttribute}=${ldapUuidAttribute}, \
|
=home=${cfg.storage.path}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}, \
|
||||||
=home=${cfg.storage.path}/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:${cfg.ldap.attributes.uuid}}"
|
||||||
}
|
}
|
||||||
user_filter = ${cfg.ldap.dovecot.userFilter}
|
user_filter = ${cfg.ldap.dovecot.userFilter}
|
||||||
pass_attrs = ${cfg.ldap.attributes.password}=password
|
pass_attrs = ${cfg.ldap.attributes.password}=password
|
||||||
|
|||||||
Reference in New Issue
Block a user