diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-17 12:05:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 12:05:49 +0000 |
| commit | 425886d6c26fb650fbfe804d97f283aa53b622b7 (patch) | |
| tree | 38705e979603beb10130b4a350a361f330c08cd4 /nixos/modules | |
| parent | 1b82d09a506031e3cf45f11ca04efbf4dd8bc75f (diff) | |
| parent | 8db8975228581cb80f2b7581fd445afa4aab43f9 (diff) | |
| download | nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.tar nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.tar.gz nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.tar.bz2 nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.tar.lz nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.tar.xz nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.tar.zst nixpkgs-425886d6c26fb650fbfe804d97f283aa53b622b7.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/mail/mailman.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/nullmailer.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 84b0fbc5f6e..f75d6183c3e 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -454,7 +454,7 @@ in { }; meta = { - maintainers = with lib.maintainers; [ lheckemann ]; + maintainers = with lib.maintainers; [ lheckemann qyliss ]; doc = ./mailman.xml; }; diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index fe3f8ef9b39..09874ca0ed7 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -204,6 +204,7 @@ with lib; users.${cfg.user} = { description = "Nullmailer relay-only mta user"; group = cfg.group; + isSystemUser = true; }; groups.${cfg.group} = { }; |