better destinations

2 files changed, 3 insertions, 10 deletions

diff --git a/odin.nix b/odin.nix
index 1c0b1ecf..82af945f 100644
--- a/odin.nix
+++ b/odin.nix
@@ -107,17 +107,9 @@
     rootAlias = "gkleen";
 
     destination = [''regexp:${pkgs.writeText "destination" ''
-        /\.?yggdrasil\.li$/ ACCEPT
-        /\.?praseodym\.org$/ ACCEPT
-        /\.?141\.li$/ ACCEPT
-        /\.?xmpp\.li$/ ACCEPT
-        /\.?kleen\.li$/ ACCEPT
-        /\.?dirty-haskell\.org$/ ACCEPT
-        /\.?nights\.email$/ ACCEPT
-        /\.?yggdrasil$/ ACCEPT
         /\.?localdomain$/ ACCEPT
         /^localhost$/ ACCEPT
-        /\.?odin$/ ACCEPT
+        /\.?odin(\.asgard\.yggdrasil)?$/ ACCEPT
       ''}''];
     config = {
       default_transport = "uucp:ymir";
diff --git a/ymir.nix b/ymir.nix
index a0a58041..3b244d89 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -520,7 +520,8 @@ in rec {
       transport_maps = ''regexp:${pkgs.writeText "transport" ''
         /@(lists?|l)\./ mlmmj:
         /@subs?\.(lists?|l)\./ mlmmj-subs:
-      ''} regexp:/srv/mail/transport pipemap:{texthash:/srv/mail/discard,static:{discard:}}'';
+        /@odin(\.asgard\.yggdrasil)?^/ uucp:odin
+      ''} pipemap:{texthash:/srv/mail/discard,static:{discard:}}'';
 
       local_recipient_maps = "";