From 6e8491a3198942feb63b7014234b7ec07b73b350 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 26 Jul 2017 15:20:29 +0200
Subject: Formulate all master.cf entries

---
 ymir.nix | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/ymir.nix b/ymir.nix
index 04858dad..c5902f9a 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -570,12 +570,36 @@ in rec {
     masterConfig = {
       uucp = {
         type = "unix";
-        private = true;
-        privileged = false;
+        private = null;
+        privileged = true;
         chroot = false;
         command = "pipe";
         args = [ "flags=Fqhu" "user=uucp" ''argv=${config.security.wrapperDir}/uux -z -a $sender - $nexthop!rmail ($recipient)'' ];
       };
+      mlmmj = {
+        type = "unix";
+        private = null;
+        privileged = true;
+        chroot = false;
+        command = "pipe";
+        args = [ "flags=ORhu" "user=mlmmj" ''argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}'' ];
+      };
+      mlmmj-subs = {
+        type = "unix";
+        private = null;
+        privileged = true;
+        chroot = false;
+        command = "pipe";
+        args = [ "flags=Fqhu" "user=uucp" ''argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}'' ];
+      };
+      policy-spf = {
+        type = "unix";
+        private = null;
+        privileged = true;
+        chroot = false;
+        command = "spawn";
+        args = [ "user=nobody" ''argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf}'' ];
+      };
     };
     # extraMasterConf = ''
     #   uucp            unix - n n - - pipe  flags=Fqhu user=uucp   argv=${config.security.wrapperDir}/uux -z -a $sender - $nexthop!rmail ($recipient)
-- 
cgit v1.2.3