From 2a0fe6e95985596b389136b4ce771775553f8d2b Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 16 May 2016 22:41:28 +0200 Subject: regexp destination --- ymir.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ymir.nix b/ymir.nix index bcb31d48..58495b8f 100644 --- a/ymir.nix +++ b/ymir.nix @@ -327,7 +327,7 @@ in rec { extraAliases = '' uucp: root ''; - 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"]; + #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"]; sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem"; sslKey = "/var/lib/acme/yggdrasil.li/key.pem"; extraConfig = '' @@ -354,6 +354,20 @@ in rec { #enable TLS logging to see the ciphers for outbound connections smtp_tls_loglevel = 1 + destination = regexp:${pkgs.writeText "destination" '' + /\.?yggdrasil\.li$/ ACCEPT + /\.?praseodym\.org$/ ACCEPT + /\.?141\.li$/ ACCEPT + /\.?xmpp\.li$/ ACCEPT + /\.?dirty-haskell\.org$/ ACCEPT + /\.?explainuxul\.de$/ ACCEPT + /\.?lmu\.li$/ ACCEPT + /\.?yggdrasil$/ ACCEPT + /\.?localdomain$/ ACCEPT + /^localhost$/ ACCEPT + /\.?ymir$/ ACCEPT + ''} + transport_maps = regexp:${pkgs.writeText "transport" '' /^gkleen[@\+]/ uucp:isaac ''} -- cgit v1.2.3