3 files changed, 39 insertions, 1 deletions

diff --git a/ymir.nix b/ymir.nix
index 81357bc6..0293578e 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -19,6 +19,7 @@ let
                "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li"
                "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org"
                "ymir.kleen.li" "kleen.li" "www.kleen.li"
+               "ymir.nights.email" "nights.email" "www.nights.email"
               ];
 in rec {
   imports =
@@ -238,7 +239,7 @@ in rec {
     '';
 
     virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; })
-      ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li"]);
+      ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]);
   };
   security.pam.services."xmpp".text = ''
     auth requisite  pam_succeed_if.so user ingroup xmpp
@@ -359,6 +360,7 @@ in rec {
         /\.?xmpp\.li$/ ACCEPT
         /\.?kleen\.li$/ ACCEPT
         /\.?dirty-haskell\.org$/ ACCEPT
+        /\.?nights\.email$/ ACCEPT
         /\.?yggdrasil$/ ACCEPT
         /\.?localdomain$/ ACCEPT
         /^localhost$/ ACCEPT
@@ -497,6 +499,7 @@ in rec {
                        ".141.li" "141.li"
                        ".xmpp.li" "xmpp.li"
                        ".kleen.li" "kleen.li"
+                       ".nights.email" "nights.email"
                        ".lmu.li" "lmu.li"
                        ".dirty-haskell.org" "dirty-haskell.org"
                      ];
diff --git a/ymir/zones/email.nights.soa b/ymir/zones/email.nights.soa
new file mode 100644
index 00000000..ac31f254
--- /dev/null
+++ b/ymir/zones/email.nights.soa
@@ -0,0 +1,34 @@
+$ORIGIN nights.email.
+$TTL 3600
+@ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
+  2017012701 ; serial
+  10800      ; refresh
+  3600       ; retry
+  604800     ; expire
+  3600       ; min TTL
+)
+                        IN      NS      ns.yggdrasil.li.
+                        IN      NS      ns.inwx.de.
+                        IN      NS      ns2.inwx.de.
+                        IN      NS      ns3.inwx.eu.
+                        IN      NS      ns4.inwx.com.
+                        IN      NS      ns5.inwx.net.
+
+@                       IN      A       188.68.51.254
+@                       IN      AAAA    2a03:4000:6:d004::
+@                       IN      MX      0 ymir.yggdrasil.li.
+@                       IN      TXT     "v=spf1 redirect=yggdrasil.li"
+
+*                       IN      A       188.68.51.254
+*                       IN      AAAA    2a03:4000:6:d004::
+*                       IN      MX      0 ymir.yggdrasil.li.
+*                       IN      TXT     "v=spf1 redirect=yggdrasil.li"
+
+ymir._domainkey         IN      TXT     ( 
+  "v=DKIM1;k=rsa;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq3cCKlk+VPhyAanLZTM0BCzUT/+fmxHioZcFk0uJk1akBYj7BRofR7eVNcLKpm3rwYMQgE+9vJH9p8SV6tws9EcWc8SMCqqGZlREYM7PmLDiTSK/vjCzkygfgFCb0EBNsY2A/fpP4rTeoxrbcBSvMkq97iY5rwyw4wXZVZXLiDaCj23s8POoxTk1ClqUJZJQ5x2"
+  "qzrC0RfN5kLZ9A7Gq2jB09vNxpXHYqABA0bJv88JiZM7hfkp9IafJZ+yCVMaBcJs4DAxnTjNAuFD9gm+qSFVY8+yeXqL6Qjo5PbruhyZRBW8RgRYT8t5n07XRglMGKKGMwOGLanrltcyXqB+GsDZBD36RAAwjFadnxdpDyRv4SgRP7ff2tKRrORYpmpN+mKdqw5j3J/nP6bXV1oAkyh9XQkPEIDi81WT87EZziTElDzVp6A2qFOxqucAovoRk24"
+  "7vlsns1FApFRsp9mja0UZNObyKD1M6tP9Ep7lS76tFGMk+WDvXRJH5LEsyCpu7sSyl1r/O0M4K+KldRCqLlZd7rf8F5P8T0dn1azk05g7F4p0N/y9GNdzXbPZ9u0eZdI7SEdh8ZoOZp7NVZiBFfbWLSS5ZtyA2kbBa4i7GJ/cuAbEKOmqAkeQPiu96TGIcyjkXjS6mTPI+9UmKZYZC+OM8XdJ02y5KRoonCc19ZS8CAwEAAQ=="
+)
+
+_xmpp-client._tcp       IN      SRV     5 0 5222 ymir.yggdrasil.li.
+_xmpp-server._tcp       IN      SRV     5 0 5269 ymir.yggdrasil.li.
diff --git a/ymir/zones/index.nix b/ymir/zones/index.nix
index b81df783..05da73f1 100644
--- a/ymir/zones/index.nix
+++ b/ymir/zones/index.nix
@@ -9,4 +9,5 @@ rec {
   "xmpp.li" = { data = readFile ./li.xmpp.soa; };
   "yggdrasil.li" = { data = readFile ./li.yggdrasil.soa; };
   "kleen.li" = { data = readFile ./li.kleen.soa; };
+  "nights.email" = { data = readFile ./email.nights.soa; };
 }