Rename mailserver.loginAccounts to mailserver.accounts
The "login" prefix makes this option more confusing rather than clearer, because what other account types are there? LDAP ones for example, but you can login with those too, so the prefix is pointless.
This commit is contained in:
@@ -86,7 +86,7 @@ let
|
||||
rm "${sieveDirectory}/${name}/default.svbin"
|
||||
fi
|
||||
''
|
||||
) (map (user: { inherit (user) name sieveScript; }) (lib.attrValues loginAccounts))}
|
||||
) (map (user: { inherit (user) name sieveScript; }) (lib.attrValues accounts))}
|
||||
'';
|
||||
in
|
||||
{
|
||||
@@ -102,14 +102,14 @@ in
|
||||
]
|
||||
) == 1;
|
||||
message = "Login account ${acct.name} must provide exactly one of password file, hashed password, or hashed password file";
|
||||
}) (lib.attrValues loginAccounts);
|
||||
}) (lib.attrValues accounts);
|
||||
|
||||
# warn for accounts that specify both password and file
|
||||
warnings =
|
||||
map (acct: "${acct.name} specifies both a password hash and hash file; hash file will be used")
|
||||
(
|
||||
lib.filter (acct: (acct.hashedPassword != null && acct.hashedPasswordFile != null)) (
|
||||
lib.attrValues loginAccounts
|
||||
lib.attrValues accounts
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user