summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-05 15:36:08 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-05 15:36:08 +0200
commitc0789c0c538e1c4e7a7af39d7d0618ee6291ec34 (patch)
tree7593a764962b3a3647866f83b4c1977a422c87f4
parent8767494f1c8fe099a1f466e772b1996355de4f6f (diff)
downloadnixos-c0789c0c538e1c4e7a7af39d7d0618ee6291ec34.tar
nixos-c0789c0c538e1c4e7a7af39d7d0618ee6291ec34.tar.gz
nixos-c0789c0c538e1c4e7a7af39d7d0618ee6291ec34.tar.bz2
nixos-c0789c0c538e1c4e7a7af39d7d0618ee6291ec34.tar.xz
nixos-c0789c0c538e1c4e7a7af39d7d0618ee6291ec34.zip
-rw-r--r--odin.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/odin.nix b/odin.nix
index 33322c04..1c0b1ecf 100644
--- a/odin.nix
+++ b/odin.nix
@@ -107,11 +107,18 @@
107 rootAlias = "gkleen"; 107 rootAlias = "gkleen";
108 108
109 destination = [''regexp:${pkgs.writeText "destination" '' 109 destination = [''regexp:${pkgs.writeText "destination" ''
110 /\.?yggdrasil\.li$/ ACCEPT
111 /\.?praseodym\.org$/ ACCEPT
112 /\.?141\.li$/ ACCEPT
113 /\.?xmpp\.li$/ ACCEPT
114 /\.?kleen\.li$/ ACCEPT
115 /\.?dirty-haskell\.org$/ ACCEPT
116 /\.?nights\.email$/ ACCEPT
117 /\.?yggdrasil$/ ACCEPT
110 /\.?localdomain$/ ACCEPT 118 /\.?localdomain$/ ACCEPT
111 /^localhost$/ ACCEPT 119 /^localhost$/ ACCEPT
112 /\.?odin(\.asgard\.yggdrasil)?$/ ACCEPT 120 /\.?odin$/ ACCEPT
113 ''}'']; 121 ''}''];
114
115 config = { 122 config = {
116 default_transport = "uucp:ymir"; 123 default_transport = "uucp:ymir";
117 124
@@ -121,8 +128,6 @@
121 mail_spool_directory = "/srv/mail"; 128 mail_spool_directory = "/srv/mail";
122 129
123 luser_relay = ''postmaster''${recipient_delimiter}''${local:unknown}''; 130 luser_relay = ''postmaster''${recipient_delimiter}''${local:unknown}'';
124
125 export_environment = "TZ MAIL_CONFIG LANG NIX_PATH PATH=/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin";
126 }; 131 };
127 132
128 masterConfig = { 133 masterConfig = {