From de4b220c1148320946882b920bb8d928f7d6c186 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 11 Dec 2020 18:54:38 +0000
Subject: nixos/mailman: add mailman group

Extracted from
b478e0043c53964c99cc9a145c155a673af3c7d8 ("nixos/mailman: refactor"),
to bring myself closer to current upstream.
---
 nixpkgs/nixos/modules/services/mail/mailman.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'nixpkgs/nixos/modules')

diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index b10f9a22e17e..1b8ba29aed31 100644
--- a/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -186,7 +186,12 @@ in {
       (requirePostfixHash [ "config" "local_recipient_maps" ] "postfix_lmtp")
     ];
 
-    users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; };
+    users.users.mailman = {
+      description = "GNU Mailman";
+      isSystemUser = true;
+      group = "mailman";
+    };
+    users.groups.mailman = {};
 
     environment.etc."mailman3/mailman.cfg".text = mailmanCfg;
 
@@ -227,6 +232,7 @@ in {
           ExecStart = "${cfg.package}/bin/mailman start";
           ExecStop = "${cfg.package}/bin/mailman stop";
           User = "mailman";
+          Group = "mailman";
           Type = "forking";
           RuntimeDirectory = "mailman";
           LogsDirectory = "mailman";
@@ -295,6 +301,7 @@ in {
         '';
         serviceConfig = {
           User = cfg.webUser;
+          Group = "mailman";
           Type = "oneshot";
           # Similar to mailman-settings.service, this makes restartTriggers work
           # properly for this service.
@@ -310,6 +317,7 @@ in {
         serviceConfig = {
           ExecStart = "${cfg.package}/bin/mailman digests --send";
           User = "mailman";
+          Group = "mailman";
         };
       };
 
@@ -322,6 +330,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web qcluster";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
@@ -334,6 +343,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs minutely";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
@@ -346,6 +356,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs quarter_hourly";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
@@ -358,6 +369,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs hourly";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
@@ -370,6 +382,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs daily";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
@@ -382,6 +395,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs weekly";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
@@ -394,6 +408,7 @@ in {
         serviceConfig = {
           ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs yearly";
           User = cfg.webUser;
+          Group = "mailman";
           WorkingDirectory = "/var/lib/mailman-web";
         };
       };
-- 
cgit 1.4.1