about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2023-07-13 21:44:18 +0200
committerGitHub <noreply@github.com>2023-07-13 21:44:18 +0200
commit6873b5c7ee84458e4803565c6c435616e0bb9a41 (patch)
tree4be5a222b56f1e4df12b6d618eb7e7404f597a9a /nixos
parent4a6f4b549b6e5297776673c22be1361c858e2bc0 (diff)
parentb2c1b176d902477a623f3e7b99e2cf8900b0ea06 (diff)
downloadnixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.tar
nixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.tar.gz
nixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.tar.bz2
nixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.tar.lz
nixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.tar.xz
nixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.tar.zst
nixlib-6873b5c7ee84458e4803565c6c435616e0bb9a41.zip
Merge pull request #243289 from SuperSandro2000/nullmailer-group
nixos/nullmailer: allow users in the nullmailer group to send mails
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/mail/nullmailer.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 7c72229efb24..f6befe246b12 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -203,7 +203,7 @@ with lib;
     users = {
       users.${cfg.user} = {
         description = "Nullmailer relay-only mta user";
-        group = cfg.group;
+        inherit (cfg) group;
         isSystemUser = true;
       };
 
@@ -211,10 +211,10 @@ with lib;
     };
 
     systemd.tmpfiles.rules = [
-      "d /var/spool/nullmailer - ${cfg.user} - - -"
-      "d /var/spool/nullmailer/failed 750 ${cfg.user} - - -"
-      "d /var/spool/nullmailer/queue 750 ${cfg.user} - - -"
-      "d /var/spool/nullmailer/tmp 750 ${cfg.user} - - -"
+      "d /var/spool/nullmailer - ${cfg.user} ${cfg.group} - -"
+      "d /var/spool/nullmailer/failed 770 ${cfg.user} ${cfg.group} - -"
+      "d /var/spool/nullmailer/queue 770 ${cfg.user} ${cfg.group} - -"
+      "d /var/spool/nullmailer/tmp 770 ${cfg.user} ${cfg.group} - -"
     ];
 
     systemd.services.nullmailer = {
@@ -238,7 +238,7 @@ with lib;
       program = "sendmail";
       source = "${pkgs.nullmailer}/bin/sendmail";
       owner = cfg.user;
-      group = cfg.group;
+      inherit (cfg) group;
       setuid = true;
       setgid = true;
     };