1 files changed, 24 insertions, 14 deletions

diff --git a/ymir.nix b/ymir.nix
index 2772be91..44fff20e 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -567,25 +567,35 @@ in rec {
       recipient_canonical_maps = tcp:localhost:10002
       recipient_canonical_classes= envelope_recipient,header_recipient
     '';
-    extraMasterConf = ''
-      uucp            unix - n n - - pipe  flags=Fqhu user=uucp   argv=${config.security.wrapperDir}/uux -z -a $sender - $nexthop!rmail ($recipient)
-      mlmmj           unix - n n - - pipe  flags=ORhu user=mlmmj  argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}
-      mlmmj-subs      unix - n n - - pipe  flags=ORhu user=mlmmj  argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}
-      policy-spf      unix - n n - - spawn            user=nobody argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf}
-      logEmail        unix - n n - 10 pipe flags=Rq   user=nobody null_sender= argv=${pkgs.writeScript "logEmail" ''
-        #!${pkgs.stdenv.shell}
+    masterConf = {
+      uucp = {
+        type = "unix";
+        private = true;
+        privileged = false;
+        chroot = false;
+        command = "pipe";
+        args = [ "flags=Fqhu" "user=uucp" ''argv=${config.security.wrapperDir}/uux -z -a $sender - $nexthop!rmail ($recipient)'' ];
+      };
+    };
+    # extraMasterConf = ''
+    #   uucp            unix - n n - - pipe  flags=Fqhu user=uucp   argv=${config.security.wrapperDir}/uux -z -a $sender - $nexthop!rmail ($recipient)
+    #   mlmmj           unix - n n - - pipe  flags=ORhu user=mlmmj  argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}
+    #   mlmmj-subs      unix - n n - - pipe  flags=ORhu user=mlmmj  argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}
+    #   policy-spf      unix - n n - - spawn            user=nobody argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf}
+    #   logEmail        unix - n n - 10 pipe flags=Rq   user=nobody null_sender= argv=${pkgs.writeScript "logEmail" ''
+    #     #!${pkgs.stdenv.shell}
 
-        export PATH=${config.security.wrapperDir}:/run/current-system/sw/bin
+    #     export PATH=${config.security.wrapperDir}:/run/current-system/sw/bin
 
-        mailFile=/tmp/logEmail/$(date +"%F-%H%M%S").$$
+    #     mailFile=/tmp/logEmail/$(date +"%F-%H%M%S").$$
 
-        mkdir -p -m 700 /tmp/logEmail
+    #     mkdir -p -m 700 /tmp/logEmail
 
-        cat >$mailFile
+    #     cat >$mailFile
 
-        sendmail -G -i "$@" <$mailFile
-      ''} -f ''${sender} -- ''${recipient}
-    '';
+    #     sendmail -G -i "$@" <$mailFile
+    #   ''} -f ''${sender} -- ''${recipient}
+    # '';
     networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"];
   };