about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-24 09:15:02 -0500
committerAaron Andersen <aaron@fosslib.net>2019-04-13 07:00:57 -0400
commit64fdacc5809e0560ad5149f92576e5eebaafc16a (patch)
tree585a3073e2aa5ce1a72c52b1ef17b811285182a6 /nixos/modules
parenta6bbc55ae1584e33e4730ce547cdbfa311fd2d3f (diff)
downloadnixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.tar
nixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.tar.gz
nixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.tar.bz2
nixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.tar.lz
nixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.tar.xz
nixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.tar.zst
nixlib-64fdacc5809e0560ad5149f92576e5eebaafc16a.zip
nixos/nullmailer: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/mail/nullmailer.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 418c02af4b7f..9997d287013e 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -212,6 +212,10 @@ with lib;
       };
     };
 
+    systemd.tmpfiles.rules = [
+      "d /var/spool/nullmailer - ${cfg.user} - - -"
+    ];
+
     systemd.services.nullmailer = {
       description = "nullmailer";
       wantedBy = [ "multi-user.target" ];
@@ -220,13 +224,11 @@ with lib;
       preStart = ''
         mkdir -p /var/spool/nullmailer/{queue,tmp}
         rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
-        chown ${cfg.user} /var/spool/nullmailer/*
       '';
 
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
-        PermissionsStartOnly=true;
         ExecStart = "${pkgs.nullmailer}/bin/nullmailer-send";
         Restart = "always";
       };