diff options
| author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-11-10 13:15:26 +0100 |
|---|---|---|
| committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-11-10 13:15:26 +0100 |
| commit | 7ed82e6c94faa947e964ea465ca7748d27192264 (patch) | |
| tree | 0fdec4be8393531d3b2dacc500066834066c7132 | |
| parent | 2be833ca09625faa97803c9e6920b0e6e97605be (diff) | |
| download | nixos-7ed82e6c94faa947e964ea465ca7748d27192264.tar nixos-7ed82e6c94faa947e964ea465ca7748d27192264.tar.gz nixos-7ed82e6c94faa947e964ea465ca7748d27192264.tar.bz2 nixos-7ed82e6c94faa947e964ea465ca7748d27192264.tar.xz nixos-7ed82e6c94faa947e964ea465ca7748d27192264.zip | |
reinstate SRS
| -rw-r--r-- | ymir.nix | 22 |
1 files changed, 17 insertions, 5 deletions
| @@ -460,6 +460,18 @@ in rec { | |||
| 460 | maximal_backoff_time = 10m | 460 | maximal_backoff_time = 10m |
| 461 | maximal_queue_lifetime = 100m | 461 | maximal_queue_lifetime = 100m |
| 462 | bounce_queue_lifetime = 20m | 462 | bounce_queue_lifetime = 20m |
| 463 | |||
| 464 | sender_canonical_maps = pipemap:{unionmap:{regexp:${pkgs.writeText "nosrs" '' | ||
| 465 | /((@.*\.)|@)yggdrasil\.li$/ ACCEPT | ||
| 466 | /((@.*\.)|@)praseodym\.org$/ ACCEPT | ||
| 467 | /((@.*\.)|@)141\.li$/ ACCEPT | ||
| 468 | /((@.*\.)|@)xmpp\.li$/ ACCEPT | ||
| 469 | /((@.*\.)|@)dirty-haskell\.org$/ ACCEPT | ||
| 470 | /((@.*\.)|@)lmu\.li$/ ACCEPT | ||
| 471 | ''}, regexp:${pkgs.writeText "id" ''/^(.*)$/ $1''}}, regexp:${pkgs.writeText "clean" ''/^[^,]*,(.*)$/ $1''}, tcp:localhost:10001} | ||
| 472 | sender_canonical_classes = envelope_sender | ||
| 473 | recipient_canonical_maps = tcp:localhost:10002 | ||
| 474 | recipient_canonical_classes= envelope_recipient,header_recipient | ||
| 463 | ''; | 475 | ''; |
| 464 | extraMasterConf = '' | 476 | extraMasterConf = '' |
| 465 | uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient) | 477 | uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient) |
| @@ -470,10 +482,10 @@ in rec { | |||
| 470 | networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"]; | 482 | networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"]; |
| 471 | }; | 483 | }; |
| 472 | 484 | ||
| 473 | # services.postsrsd = { | 485 | services.postsrsd = { |
| 474 | # enable = false; | 486 | enable = false; |
| 475 | # domain = "141.li"; | 487 | domain = "srs.141.li"; |
| 476 | # separator = "+"; | 488 | separator = "+"; |
| 477 | # excludeDomains = [ ".yggdrasil.li" "yggdrasil.li" | 489 | # excludeDomains = [ ".yggdrasil.li" "yggdrasil.li" |
| 478 | # ".praseodym.org" "praseodym.org" | 490 | # ".praseodym.org" "praseodym.org" |
| 479 | # ".141.li" "141.li" | 491 | # ".141.li" "141.li" |
| @@ -481,7 +493,7 @@ in rec { | |||
| 481 | # ".lmu.li" "lmu.li" | 493 | # ".lmu.li" "lmu.li" |
| 482 | # ".dirty-haskell.org" "dirty-haskell.org" | 494 | # ".dirty-haskell.org" "dirty-haskell.org" |
| 483 | # ]; | 495 | # ]; |
| 484 | # }; | 496 | }; |
| 485 | 497 | ||
| 486 | systemd.timers."mlmmj-maintd" = { | 498 | systemd.timers."mlmmj-maintd" = { |
| 487 | description = "run mlmmj maintenance daemon"; | 499 | description = "run mlmmj maintenance daemon"; |
