Think default should come last

This commit is contained in:
niten 2023-10-13 21:33:17 -07:00
parent 44b9a32259
commit 34b51d34b9
1 changed files with 2 additions and 7 deletions

View File

@ -331,7 +331,8 @@ in {
concatStringsSep "," users concatStringsSep "," users
}") allDomains)) cfg.aliases.alias-users; }") allDomains)) cfg.aliases.alias-users;
in writeEntries "sender_login_maps" in writeEntries "sender_login_maps"
(defaultMaps ++ userAliasMaps ++ aliasUserMaps); # NOTE: Order is important! If a name matches `default`, it won't keep going
(userAliasMaps ++ aliasUserMaps ++ defaultMaps);
}; };
networks = cfg.trusted-networks; networks = cfg.trusted-networks;
@ -358,12 +359,6 @@ in {
virtual_mailbox_domains = allDomains; virtual_mailbox_domains = allDomains;
virtual_mailbox_maps = mappedFile "virtual_mailbox_map"; virtual_mailbox_maps = mappedFile "virtual_mailbox_map";
## I don't think these are needed...
# virtual_uid_maps = let uid = config.users.users."${cfg.user}".uid;
# in "static:${toString uid}";
# virtual_gid_maps = let gid = config.users.groups."${cfg.group}".gid;
# in "static: ${toString gid}";
virtual_transport = "lmtp:inet:${cfg.lmtp-server.host}:${ virtual_transport = "lmtp:inet:${cfg.lmtp-server.host}:${
toString cfg.lmtp-server.port toString cfg.lmtp-server.port
}"; }";