diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-22 22:46:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-22 22:46:17 +0100 |
| commit | 9a7bca27cc2d35e5f2726e650cda44a176974836 (patch) | |
| tree | e429f8f78c202f53112a33d2b7dda8a6583b6564 | |
| parent | f4615bef063265001f47ee7e8e351aa1708f773a (diff) | |
| parent | fa388534e4a74f4055643e5ed85c95ee4148eda4 (diff) | |
| download | nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.tar nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.tar.gz nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.tar.bz2 nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.tar.lz nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.tar.xz nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.tar.zst nixlib-9a7bca27cc2d35e5f2726e650cda44a176974836.zip | |
Merge pull request #48834 from dhess/dovenull-group-fix
dovecot: dovenull user should have its own group.
| -rw-r--r-- | nixos/modules/misc/ids.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/dovecot.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0b4ed6d3b628..5c30e512a1b3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -385,7 +385,7 @@ virtuoso = 44; #rtkit = 45; # unused dovecot2 = 46; - #dovenull = 47; # unused + dovenull2 = 47; prayer = 49; mpd = 50; clamav = 51; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index e6091182b2ab..30ad7d82fb80 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -311,7 +311,7 @@ in { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; - group = cfg.group; + group = "dovenull"; } ] ++ optional (cfg.user == "dovecot2") { name = "dovecot2"; @@ -332,6 +332,10 @@ in } ++ optional (cfg.createMailUser && cfg.mailGroup != null) { name = cfg.mailGroup; + } + ++ singleton + { name = "dovenull"; + gid = config.ids.gids.dovenull2; }; environment.etc."dovecot/modules".source = modulesDir; |