From 6d3cc3b327b1f0b2ea89f566c271cc9cf004de9e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 2 Feb 2019 15:39:03 +0100
Subject: ...

---
 custom/ymir-nginx.nix | 90 +++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 3d2b7b4c..8df451fd 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -29,52 +29,46 @@ let
     }
   '';
 
-  mail-autoconfig = let
-    configXML = pkgs.writeTextFile {
-      name = "mail-autoconfig";
-      destination = "/config-v1.1.xml";
-      text = ''
-        <?xml version="1.0" encoding="UTF-8"?>
-        <clientConfig version="1.1">
-          <emailProvider id="praseodym.org">
-            <domain>141.li</domain>
-            <domain>xmpp.li</domain>
-            <domain>yggdrasil.li</domain>
-            <domain>praseodym.org</domain>
-            <domain>kleen.li</domain>
-            <domain>nights.email</domain>
-            <displayName>Praseodym</displayName>
-            <displayShortName>Praseodym</displayShortName>
-            <incomingServer type="imap">
-              <hostname>ymir.yggdrasil.li</hostname>
-              <port>143</port>
-              <socketType>STARTTLS</socketType>
-              <authentication>password-cleartext</authentication>
-              <username>%EMAILLOCALPART%</username>
-            </incomingServer>
-            <outgoingServer type="smtp">
-              <hostname>ymir.yggdrasil.li</hostname>
-              <port>25</port>
-              <socketType>STARTTLS</socketType>
-              <authentication>password-cleartext</authentication>
-              <username>%EMAILLOCALPART%</username>
-            </outgoingServer>
-            <incomingServer type="imap">
-              <hostname>ymir.yggdrasil.li</hostname>
-              <port>993</port>
-              <socketType>SSL</socketType>
-              <authentication>password-cleartext</authentication>
-              <username>%EMAILLOCALPART%</username>
-            </incomingServer>
-          </emailProvider>
-        </clientConfig>
-      '';
-    };
-  in builtins.toFile "mail-autoconfig" ''
-    location /.well-known/autoconfig/mail {
-      root ${configXML};
-    }
-  '';
+  mail-autoconfig = pkgs.writeTextFile {
+    name = "mail-autoconfig";
+    destination = "/config-v1.1.xml";
+    text = ''
+      <?xml version="1.0" encoding="UTF-8"?>
+      <clientConfig version="1.1">
+        <emailProvider id="praseodym.org">
+          <domain>141.li</domain>
+          <domain>xmpp.li</domain>
+          <domain>yggdrasil.li</domain>
+          <domain>praseodym.org</domain>
+          <domain>kleen.li</domain>
+          <domain>nights.email</domain>
+          <displayName>Praseodym</displayName>
+          <displayShortName>Praseodym</displayShortName>
+          <incomingServer type="imap">
+            <hostname>ymir.yggdrasil.li</hostname>
+            <port>143</port>
+            <socketType>STARTTLS</socketType>
+            <authentication>password-cleartext</authentication>
+            <username>%EMAILLOCALPART%</username>
+          </incomingServer>
+          <outgoingServer type="smtp">
+            <hostname>ymir.yggdrasil.li</hostname>
+            <port>25</port>
+            <socketType>STARTTLS</socketType>
+            <authentication>password-cleartext</authentication>
+            <username>%EMAILLOCALPART%</username>
+          </outgoingServer>
+          <incomingServer type="imap">
+            <hostname>ymir.yggdrasil.li</hostname>
+            <port>993</port>
+            <socketType>SSL</socketType>
+            <authentication>password-cleartext</authentication>
+            <username>%EMAILLOCALPART%</username>
+          </incomingServer>
+        </emailProvider>
+      </clientConfig>
+    '';
+  };
 in {
   services.logrotate = {
     enable = true;
@@ -150,6 +144,10 @@ in {
         include ${mail-autoconfig};
 
         root /srv/www/default;
+
+        location /.well-known/autoconfig/mail {
+          root ${mail-autoconfig};
+        }
       }
 
       server {
-- 
cgit v1.2.3