From 29f16288001cd0d64e7c158bb1e327483a9e2d9a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 16 May 2016 22:45:13 +0200
Subject: ugh.

---
 ymir.nix | 27 +++++++++++++--------------
 1 file 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 {
       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 = [''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
+      ''}''];
     sslCert = "/var/lib/acme/yggdrasil.li/fullchain.pem";
     sslKey = "/var/lib/acme/yggdrasil.li/key.pem";
     extraConfig = ''
@@ -354,20 +367,6 @@ 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