ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2025-04-02 05:44:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rename-deprecated-dovecot-variables' into 'master'

Browse Source 
prepare for dovecot 2.4 breakage: use expanded variable names

Closes #309

See merge request simple-nixos-mailserver/nixos-mailserver!373
This commit is contained in:
Michael Lohmann 2025-03-19 19:26:14 +00:00
commit f4ae74241e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
default.nix
View File

@ -290,8 +290,8 @@ in
userFilter = mkOption { userFilter = mkOption {
type = types.str; type = types.str;
default = "mail=%u"; default = "mail=%{user}";
example = "(&(objectClass=inetOrgPerson)(mail=%u))"; example = "(&(objectClass=inetOrgPerson)(mail=%{user}))";
description = '' description = ''
Filter for user lookups in Dovecot. Filter for user lookups in Dovecot.
@ -315,8 +315,8 @@ in
passFilter = mkOption { passFilter = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = "mail=%u"; default = "mail=%{user}";
example = "(&(objectClass=inetOrgPerson)(mail=%u))"; example = "(&(objectClass=inetOrgPerson)(mail=%{user}))";
description = '' description = ''
Filter for password lookups in Dovecot. Filter for password lookups in Dovecot.

10
mail-server/dovecot.nix
View File

@ -33,9 +33,9 @@ let
# maildir in format "/${domain}/${user}" # maildir in format "/${domain}/${user}"
dovecotMaildir = dovecotMaildir =
"maildir:${cfg.mailDirectory}/%d/%n${maildirLayoutAppendix}${maildirUTF8FolderNames}" "maildir:${cfg.mailDirectory}/%{domain}/%{username}${maildirLayoutAppendix}${maildirUTF8FolderNames}"
+ (lib.optionalString (cfg.indexDir != null) + (lib.optionalString (cfg.indexDir != null)
":INDEX=${cfg.indexDir}/%d/%n" ":INDEX=${cfg.indexDir}/%{domain}/%{username}"
); );
postfixCfg = config.services.postfix; postfixCfg = config.services.postfix;
@ -177,8 +177,8 @@ in
protocols = lib.optional cfg.enableManageSieve "sieve"; protocols = lib.optional cfg.enableManageSieve "sieve";
pluginSettings = { pluginSettings = {
sieve = "file:${cfg.sieveDirectory}/%u/scripts;active=${cfg.sieveDirectory}/%u/active.sieve"; sieve = "file:${cfg.sieveDirectory}/%{user}/scripts;active=${cfg.sieveDirectory}/%{user}/active.sieve";
sieve_default = "file:${cfg.sieveDirectory}/%u/default.sieve"; sieve_default = "file:${cfg.sieveDirectory}/%{user}/default.sieve";
sieve_default_name = "default"; sieve_default_name = "default";
}; };
@ -329,7 +329,7 @@ in
userdb { userdb {
driver = ldap driver = ldap
args = ${ldapConfFile} args = ${ldapConfFile}
default_fields = home=/var/vmail/ldap/%u uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID} default_fields = home=/var/vmail/ldap/%{user} uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID}
} }
''} ''}