about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorChristian Kögler <ck3d@gmx.de>2022-10-01 12:51:57 +0200
committerGitHub <noreply@github.com>2022-10-01 12:51:57 +0200
commit1c23b486f292a895fcdc5611d3b85dfd82f1d00d (patch)
tree367dd0a084429902a1e6ce3dce98c8df03608efe /nixos
parenta68239097eef1051efd400fbb2b0bc12f2ba0387 (diff)
parent7e626703b0b892181cc1bc700d9b1cc88550243c (diff)
downloadnixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.tar
nixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.tar.gz
nixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.tar.bz2
nixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.tar.lz
nixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.tar.xz
nixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.tar.zst
nixlib-1c23b486f292a895fcdc5611d3b85dfd82f1d00d.zip
Merge pull request #189275 from wentasah/nullmailer-ownership
nixos/nullmailer: Always adjust ownership of spool directories
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/mail/nullmailer.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 336c76c98508..7c72229efb24 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -212,6 +212,9 @@ 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} - - -"
     ];
 
     systemd.services.nullmailer = {
@@ -220,7 +223,6 @@ with lib;
       after = [ "network.target" ];
 
       preStart = ''
-        mkdir -p /var/spool/nullmailer/{queue,tmp,failed}
         rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
       '';