summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-01-27 00:56:26 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-01-27 00:56:26 +0100
commit5ca14bd4b643ffba6be3fcb93af436462e9b982e (patch)
treeec2144a440db0d193cc91b9e4f41139139257d1b
parent5cc169a20d2a7524c6d4cdb6960c44f5e423a6ab (diff)
downloadnixos-5ca14bd4b643ffba6be3fcb93af436462e9b982e.tar
nixos-5ca14bd4b643ffba6be3fcb93af436462e9b982e.tar.gz
nixos-5ca14bd4b643ffba6be3fcb93af436462e9b982e.tar.bz2
nixos-5ca14bd4b643ffba6be3fcb93af436462e9b982e.tar.xz
nixos-5ca14bd4b643ffba6be3fcb93af436462e9b982e.zip
nights.email
-rw-r--r--ymir.nix5
-rw-r--r--ymir/zones/email.nights.soa34
-rw-r--r--ymir/zones/index.nix1
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
19 "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li" 19 "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li"
20 "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org" 20 "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org"
21 "ymir.kleen.li" "kleen.li" "www.kleen.li" 21 "ymir.kleen.li" "kleen.li" "www.kleen.li"
22 "ymir.nights.email" "nights.email" "www.nights.email"
22 ]; 23 ];
23in rec { 24in rec {
24 imports = 25 imports =
@@ -238,7 +239,7 @@ in rec {
238 ''; 239 '';
239 240
240 virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; }) 241 virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; })
241 ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li"]); 242 ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]);
242 }; 243 };
243 security.pam.services."xmpp".text = '' 244 security.pam.services."xmpp".text = ''
244 auth requisite pam_succeed_if.so user ingroup xmpp 245 auth requisite pam_succeed_if.so user ingroup xmpp
@@ -359,6 +360,7 @@ in rec {
359 /\.?xmpp\.li$/ ACCEPT 360 /\.?xmpp\.li$/ ACCEPT
360 /\.?kleen\.li$/ ACCEPT 361 /\.?kleen\.li$/ ACCEPT
361 /\.?dirty-haskell\.org$/ ACCEPT 362 /\.?dirty-haskell\.org$/ ACCEPT
363 /\.?nights\.email$/ ACCEPT
362 /\.?yggdrasil$/ ACCEPT 364 /\.?yggdrasil$/ ACCEPT
363 /\.?localdomain$/ ACCEPT 365 /\.?localdomain$/ ACCEPT
364 /^localhost$/ ACCEPT 366 /^localhost$/ ACCEPT
@@ -497,6 +499,7 @@ in rec {
497 ".141.li" "141.li" 499 ".141.li" "141.li"
498 ".xmpp.li" "xmpp.li" 500 ".xmpp.li" "xmpp.li"
499 ".kleen.li" "kleen.li" 501 ".kleen.li" "kleen.li"
502 ".nights.email" "nights.email"
500 ".lmu.li" "lmu.li" 503 ".lmu.li" "lmu.li"
501 ".dirty-haskell.org" "dirty-haskell.org" 504 ".dirty-haskell.org" "dirty-haskell.org"
502 ]; 505 ];
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 @@
1$ORIGIN nights.email.
2$TTL 3600
3@ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
4 2017012701 ; serial
5 10800 ; refresh
6 3600 ; retry
7 604800 ; expire
8 3600 ; min TTL
9)
10 IN NS ns.yggdrasil.li.
11 IN NS ns.inwx.de.
12 IN NS ns2.inwx.de.
13 IN NS ns3.inwx.eu.
14 IN NS ns4.inwx.com.
15 IN NS ns5.inwx.net.
16
17@ IN A 188.68.51.254
18@ IN AAAA 2a03:4000:6:d004::
19@ IN MX 0 ymir.yggdrasil.li.
20@ IN TXT "v=spf1 redirect=yggdrasil.li"
21
22* IN A 188.68.51.254
23* IN AAAA 2a03:4000:6:d004::
24* IN MX 0 ymir.yggdrasil.li.
25* IN TXT "v=spf1 redirect=yggdrasil.li"
26
27ymir._domainkey IN TXT (
28 "v=DKIM1;k=rsa;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq3cCKlk+VPhyAanLZTM0BCzUT/+fmxHioZcFk0uJk1akBYj7BRofR7eVNcLKpm3rwYMQgE+9vJH9p8SV6tws9EcWc8SMCqqGZlREYM7PmLDiTSK/vjCzkygfgFCb0EBNsY2A/fpP4rTeoxrbcBSvMkq97iY5rwyw4wXZVZXLiDaCj23s8POoxTk1ClqUJZJQ5x2"
29 "qzrC0RfN5kLZ9A7Gq2jB09vNxpXHYqABA0bJv88JiZM7hfkp9IafJZ+yCVMaBcJs4DAxnTjNAuFD9gm+qSFVY8+yeXqL6Qjo5PbruhyZRBW8RgRYT8t5n07XRglMGKKGMwOGLanrltcyXqB+GsDZBD36RAAwjFadnxdpDyRv4SgRP7ff2tKRrORYpmpN+mKdqw5j3J/nP6bXV1oAkyh9XQkPEIDi81WT87EZziTElDzVp6A2qFOxqucAovoRk24"
30 "7vlsns1FApFRsp9mja0UZNObyKD1M6tP9Ep7lS76tFGMk+WDvXRJH5LEsyCpu7sSyl1r/O0M4K+KldRCqLlZd7rf8F5P8T0dn1azk05g7F4p0N/y9GNdzXbPZ9u0eZdI7SEdh8ZoOZp7NVZiBFfbWLSS5ZtyA2kbBa4i7GJ/cuAbEKOmqAkeQPiu96TGIcyjkXjS6mTPI+9UmKZYZC+OM8XdJ02y5KRoonCc19ZS8CAwEAAQ=="
31)
32
33_xmpp-client._tcp IN SRV 5 0 5222 ymir.yggdrasil.li.
34_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 {
9 "xmpp.li" = { data = readFile ./li.xmpp.soa; }; 9 "xmpp.li" = { data = readFile ./li.xmpp.soa; };
10 "yggdrasil.li" = { data = readFile ./li.yggdrasil.soa; }; 10 "yggdrasil.li" = { data = readFile ./li.yggdrasil.soa; };
11 "kleen.li" = { data = readFile ./li.kleen.soa; }; 11 "kleen.li" = { data = readFile ./li.kleen.soa; };
12 "nights.email" = { data = readFile ./email.nights.soa; };
12} 13}