nixos/postfix: add users and groups only if needed, fix group name

This commit is contained in:
Nikolay Amiantov 2016-01-09 03:36:39 +03:00
parent 57c1d09857
commit 54bc19270b

View File

@ -378,26 +378,27 @@ in
program = "sendmail"; program = "sendmail";
source = "${pkgs.postfix}/bin/sendmail"; source = "${pkgs.postfix}/bin/sendmail";
owner = "nobody"; owner = "nobody";
group = "postdrop"; group = setgidGroup;
setuid = false; setuid = false;
setgid = true; setgid = true;
}; };
users.extraUsers = singleton users.extraUsers = optional (user == "postfix")
{ name = user; { name = "postfix";
description = "Postfix mail server user"; description = "Postfix mail server user";
uid = config.ids.uids.postfix; uid = config.ids.uids.postfix;
group = group; group = group;
}; };
users.extraGroups = users.extraGroups =
[ { name = group; optional (group == "postfix")
gid = config.ids.gids.postfix; { name = group;
} gid = config.ids.gids.postfix;
{ name = setgidGroup; }
gid = config.ids.gids.postdrop; ++ optional (setgidGroup == "postdrop")
} { name = setgidGroup;
]; gid = config.ids.gids.postdrop;
};
systemd.services.postfix = systemd.services.postfix =
{ description = "Postfix mail server"; { description = "Postfix mail server";