From 72651a88b1f56af8669009b60ab77ec7daf701d4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 30 May 2016 01:34:51 +0200 Subject: postfix disallows substitutions --- ymir.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ymir.nix b/ymir.nix index 3cfcccf8..19a36b96 100644 --- a/ymir.nix +++ b/ymir.nix @@ -370,11 +370,11 @@ in rec { transport_maps = regexp:${pkgs.writeText "transport" '' /^gkleen[@\+]/ uucp:isaac - /^([^@\+]+)\.list[@\+]/ mlmmj:$1 + /@mlmmj\.localdomain$/ mlmmj: ''} virtual_alias_maps = regexp:${pkgs.writeText "virtual" '' - /^([^@]+)@(lists?|l)\./ $1.list + /^([^@]+)@(lists?|l)\./ $1@mlmmj.localdomain ''} luser_relay = gkleen+''${local} @@ -424,7 +424,7 @@ in rec { ''; extraMasterConf = '' uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/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/$nexthop + mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/${user} ''; networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"]; }; -- cgit v1.2.3