summaryrefslogtreecommitdiff
path: root/ymir.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-05-16 22:41:28 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-05-16 22:41:28 +0200
commit2a0fe6e95985596b389136b4ce771775553f8d2b (patch)
tree1f02352f791f0e765107f94eb6ac7135926bd71e /ymir.nix
parent6cb1f4c2515e83cd615f2f0a0c61a1eb47392dd8 (diff)
downloadnixos-2a0fe6e95985596b389136b4ce771775553f8d2b.tar
nixos-2a0fe6e95985596b389136b4ce771775553f8d2b.tar.gz
nixos-2a0fe6e95985596b389136b4ce771775553f8d2b.tar.bz2
nixos-2a0fe6e95985596b389136b4ce771775553f8d2b.tar.xz
nixos-2a0fe6e95985596b389136b4ce771775553f8d2b.zip
regexp destination
Diffstat (limited to 'ymir.nix')
-rw-r--r--ymir.nix16
1 files changed, 15 insertions, 1 deletions
diff --git a/ymir.nix b/ymir.nix
index bcb31d48..58495b8f 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -327,7 +327,7 @@ in rec {
327 extraAliases = '' 327 extraAliases = ''
328 uucp: root 328 uucp: root
329 ''; 329 '';
330 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"]; 330 #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"];
331 sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem"; 331 sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem";
332 sslKey = "/var/lib/acme/yggdrasil.li/key.pem"; 332 sslKey = "/var/lib/acme/yggdrasil.li/key.pem";
333 extraConfig = '' 333 extraConfig = ''
@@ -354,6 +354,20 @@ in rec {
354 #enable TLS logging to see the ciphers for outbound connections 354 #enable TLS logging to see the ciphers for outbound connections
355 smtp_tls_loglevel = 1 355 smtp_tls_loglevel = 1
356 356
357 destination = regexp:${pkgs.writeText "destination" ''
358 /\.?yggdrasil\.li$/ ACCEPT
359 /\.?praseodym\.org$/ ACCEPT
360 /\.?141\.li$/ ACCEPT
361 /\.?xmpp\.li$/ ACCEPT
362 /\.?dirty-haskell\.org$/ ACCEPT
363 /\.?explainuxul\.de$/ ACCEPT
364 /\.?lmu\.li$/ ACCEPT
365 /\.?yggdrasil$/ ACCEPT
366 /\.?localdomain$/ ACCEPT
367 /^localhost$/ ACCEPT
368 /\.?ymir$/ ACCEPT
369 ''}
370
357 transport_maps = regexp:${pkgs.writeText "transport" '' 371 transport_maps = regexp:${pkgs.writeText "transport" ''
358 /^gkleen[@\+]/ uucp:isaac 372 /^gkleen[@\+]/ uucp:isaac
359 ''} 373 ''}