diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-01-09 03:36:39 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-12 16:41:35 +0300 |
commit | 54bc19270b6ac94ec0e8c9d740d1f21b47d2c989 (patch) | |
tree | 4011ddd12ee4250c795aa59084952897921ae62b /nixos | |
parent | 57c1d09857d826e2774e20d28783299f1f7ac6ca (diff) | |
download | nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.tar nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.tar.gz nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.tar.bz2 nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.tar.lz nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.tar.xz nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.tar.zst nixlib-54bc19270b6ac94ec0e8c9d740d1f21b47d2c989.zip |
nixos/postfix: add users and groups only if needed, fix group name
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/mail/postfix.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 35f9c53aa8c9..3231a10aa22b 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -378,26 +378,27 @@ in program = "sendmail"; source = "${pkgs.postfix}/bin/sendmail"; owner = "nobody"; - group = "postdrop"; + group = setgidGroup; setuid = false; setgid = true; }; - users.extraUsers = singleton - { name = user; + users.extraUsers = optional (user == "postfix") + { name = "postfix"; description = "Postfix mail server user"; uid = config.ids.uids.postfix; group = group; }; users.extraGroups = - [ { name = group; - gid = config.ids.gids.postfix; - } - { name = setgidGroup; - gid = config.ids.gids.postdrop; - } - ]; + optional (group == "postfix") + { name = group; + gid = config.ids.gids.postfix; + } + ++ optional (setgidGroup == "postdrop") + { name = setgidGroup; + gid = config.ids.gids.postdrop; + }; systemd.services.postfix = { description = "Postfix mail server"; |