diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix index ab08b6e..b022996 100644 --- a/mail-server/dovecot.nix +++ b/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