Unverified Commit 1c23b486 authored by Christian Kögler's avatar Christian Kögler Committed by GitHub
Browse files

Merge pull request #189275 from wentasah/nullmailer-ownership 

nixos/nullmailer: Always adjust ownership of spool directories
parents a6823909 7e626703

nixos/modules/services/mail/nullmailer.nix

+3 −1
Original line number Diff line number Diff line
@@ -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

      '';