summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ymir.nix27
1 files changed, 13 insertions, 14 deletions
diff --git a/ymir.nix b/ymir.nix
index 58495b8f..22638a0e 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -328,6 +328,19 @@ in rec {
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 destination = [''regexp:${pkgs.writeText "destination" ''
332 /\.?yggdrasil\.li$/ ACCEPT
333 /\.?praseodym\.org$/ ACCEPT
334 /\.?141\.li$/ ACCEPT
335 /\.?xmpp\.li$/ ACCEPT
336 /\.?dirty-haskell\.org$/ ACCEPT
337 /\.?explainuxul\.de$/ ACCEPT
338 /\.?lmu\.li$/ ACCEPT
339 /\.?yggdrasil$/ ACCEPT
340 /\.?localdomain$/ ACCEPT
341 /^localhost$/ ACCEPT
342 /\.?ymir$/ ACCEPT
343 ''}''];
331 sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem"; 344 sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem";
332 sslKey = "/var/lib/acme/yggdrasil.li/key.pem"; 345 sslKey = "/var/lib/acme/yggdrasil.li/key.pem";
333 extraConfig = '' 346 extraConfig = ''
@@ -354,20 +367,6 @@ in rec {
354 #enable TLS logging to see the ciphers for outbound connections 367 #enable TLS logging to see the ciphers for outbound connections
355 smtp_tls_loglevel = 1 368 smtp_tls_loglevel = 1
356 369
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
371 transport_maps = regexp:${pkgs.writeText "transport" '' 370 transport_maps = regexp:${pkgs.writeText "transport" ''
372 /^gkleen[@\+]/ uucp:isaac 371 /^gkleen[@\+]/ uucp:isaac
373 ''} 372 ''}