summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-01-27 17:02:15 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-01-27 17:02:15 +0100
commitce9cf6171f9c464df915e98717531562c6766eaf (patch)
treef6396ea230c67255d3081d2b65dde64e60ff90b7
parentf9a02d2a343ddfe04416721e41b45bb8cec305fd (diff)
downloadnixos-ce9cf6171f9c464df915e98717531562c6766eaf.tar
nixos-ce9cf6171f9c464df915e98717531562c6766eaf.tar.gz
nixos-ce9cf6171f9c464df915e98717531562c6766eaf.tar.bz2
nixos-ce9cf6171f9c464df915e98717531562c6766eaf.tar.xz
nixos-ce9cf6171f9c464df915e98717531562c6766eaf.zip
Move virtual to correct location
-rw-r--r--ymir.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/ymir.nix b/ymir.nix
index 518053a7..033fc0b9 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -351,6 +351,8 @@ in rec {
351 postmasterAlias = ""; rootAlias = ""; extraAliases = ""; 351 postmasterAlias = ""; rootAlias = ""; extraAliases = "";
352 virtual = '' 352 virtual = ''
353 blog@dirty-haskell.org dirty-haskell@lists.yggdrasil.li 353 blog@dirty-haskell.org dirty-haskell@lists.yggdrasil.li
354 nights.email x
355 @nights.email some@nights.email
354 ''; 356 '';
355 #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"]; 357 #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"];
356 destination = [''regexp:${pkgs.writeText "destination" '' 358 destination = [''regexp:${pkgs.writeText "destination" ''
@@ -480,11 +482,6 @@ in rec {
480 root gkleen 482 root gkleen
481 ''} texthash:/srv/mail/spm 483 ''} texthash:/srv/mail/spm
482 484
483 virtual_alias_maps = texthash:${pkgs.writeText "virtual_aliases" ''
484 nights.email x
485 @nights.email some@nights.email
486 ''}
487
488 queue_run_delay = 10s 485 queue_run_delay = 10s
489 minimal_backoff_time = 1m 486 minimal_backoff_time = 1m
490 maximal_backoff_time = 10m 487 maximal_backoff_time = 10m