christian
/
nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19 from eqyiel/fix-users 

Fix r-raymond/nixos-mailserver#18
This commit is contained in:
Robin Raymond 2017-11-05 10:44:18 +01:00 committed by GitHub
parent 47f742fb83 e91d237d81
commit ca05905e1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail-server/users.nix
View File

@ -19,14 +19,14 @@
with config.mailserver;
let
vmail_user = [{
vmail_user = {
name = vmailUserName;
isNormalUser = false;
uid = vmailUIDStart;
home = mailDirectory;
createHome = true;
group = vmailGroupName;
}];
};
# accountsToUser :: String -> UserRecord
accountsToUser = account: {
@ -36,8 +36,9 @@ let
inherit (account) hashedPassword;
};
# mail_user :: [ UserRecord ]
mail_user = map accountsToUser (lib.attrValues loginAccounts);
# mail_users :: { [String]: UserRecord }
mail_users = lib.foldl (prev: next: prev // { "${next.name}" = next; }) {}
(map accountsToUser (lib.attrValues loginAccounts));
in
{
@ -49,6 +50,8 @@ in
};
# define all users
users.extraUsers = vmail_user ++ mail_user;
users.users = mail_users // {
"${vmail_user.name}" = lib.mkForce vmail_user;
};
};
}