summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-04-28 23:43:23 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-04-28 23:43:23 +0200
commita2fe91478af8149c2c84fd7177f9a3c47eb238ed (patch)
tree47cbd3cb8630913e56959229d27bb51d8e931e11
parentb45b317ce545eef6032fd7a51d60042c888e5211 (diff)
downloadnixos-a2fe91478af8149c2c84fd7177f9a3c47eb238ed.tar
nixos-a2fe91478af8149c2c84fd7177f9a3c47eb238ed.tar.gz
nixos-a2fe91478af8149c2c84fd7177f9a3c47eb238ed.tar.bz2
nixos-a2fe91478af8149c2c84fd7177f9a3c47eb238ed.tar.xz
nixos-a2fe91478af8149c2c84fd7177f9a3c47eb238ed.zip
restore aliases
-rw-r--r--ymir.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/ymir.nix b/ymir.nix
index 5b5c7d61..3210e95e 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -293,7 +293,7 @@ in rec {
293 hostname = "ymir.yggdrasil.li"; 293 hostname = "ymir.yggdrasil.li";
294 recipientDelimiter = "+"; 294 recipientDelimiter = "+";
295 setSendmail = true; 295 setSendmail = true;
296 postmasterAlias = ""; 296 rootAlias = "gkleen";
297 destination = ["yggdrasil.li" "ymir.yggdrasil.li" "praseodym.org" "ymir.praseodym.org" "141.li" "ymir.141.li" "xmpp.li" "ymir.xmpp.li" "dirty-haskell.org" "explainuxul.de" "www.explainuxul.de" "lmu.li" "www.lmu.li" "localhost.yggdrasil.li" "localhost"]; 297 destination = ["yggdrasil.li" "ymir.yggdrasil.li" "praseodym.org" "ymir.praseodym.org" "141.li" "ymir.141.li" "xmpp.li" "ymir.xmpp.li" "dirty-haskell.org" "explainuxul.de" "www.explainuxul.de" "lmu.li" "www.lmu.li" "localhost.yggdrasil.li" "localhost"];
298 sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem"; 298 sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem";
299 sslKey = "/var/lib/acme/yggdrasil.li/key.pem"; 299 sslKey = "/var/lib/acme/yggdrasil.li/key.pem";
@@ -364,8 +364,7 @@ in rec {
364 reject_unauth_destination, 364 reject_unauth_destination,
365 permit 365 permit
366 366
367 alias_database = 367 alias_maps = hash:/etc/postfix/aliases
368 alias_maps =
369 ''; 368 '';
370 extraMasterConf = '' 369 extraMasterConf = ''
371 uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a$sender - $nexthop!rmail ($recipient) 370 uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a$sender - $nexthop!rmail ($recipient)