Merge pull request #48834 from dhess/dovenull-group-fix

dovecot: dovenull user should have its own group.

authored by Jörg Thalheim and committed by GitHub 9a7bca27 f4615bef

+6 -2
+1 -1
nixos/modules/misc/ids.nix
··· 385 385 virtuoso = 44; 386 386 #rtkit = 45; # unused 387 387 dovecot2 = 46; 388 - #dovenull = 47; # unused 388 + dovenull2 = 47; 389 389 prayer = 49; 390 390 mpd = 50; 391 391 clamav = 51;
+5 -1
nixos/modules/services/mail/dovecot.nix
··· 311 311 { name = "dovenull"; 312 312 uid = config.ids.uids.dovenull2; 313 313 description = "Dovecot user for untrusted logins"; 314 - group = cfg.group; 314 + group = "dovenull"; 315 315 } 316 316 ] ++ optional (cfg.user == "dovecot2") 317 317 { name = "dovecot2"; ··· 332 332 } 333 333 ++ optional (cfg.createMailUser && cfg.mailGroup != null) 334 334 { name = cfg.mailGroup; 335 + } 336 + ++ singleton 337 + { name = "dovenull"; 338 + gid = config.ids.gids.dovenull2; 335 339 }; 336 340 337 341 environment.etc."dovecot/modules".source = modulesDir;