Merge branch 'ldap-uuid-attr-crash' into 'master'

dovecot: drop redundant uuid mapping in user_attrs

Closes #352

See merge request simple-nixos-mailserver/nixos-mailserver!506

mail-server/dovecot.nix

@@ -61,7 +61,6 @@ let
 
   postfixCfg = config.services.postfix;
 
-  ldapUuidAttribute = cfg.ldap.attributes.uuid;
   ldapConfig = pkgs.writeTextFile {
     name = "dovecot-ldap.conf.ext.template";
     text = ''
@@ -78,10 +77,11 @@ let
       base = ${cfg.ldap.base}
       scope = ${mkLdapSearchScope cfg.ldap.scope}
       user_attrs = \
-        ${ldapUuidAttribute}=${ldapUuidAttribute}, \
-        =home=${cfg.storage.path}/ldap/%{ldap:${ldapUuidAttribute}}, \
+        =home=${cfg.storage.path}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}, \
         =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}
       pass_attrs = ${cfg.ldap.attributes.password}=password