3 files changed, 0 insertions, 83 deletions
diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix
index 5dd60190..e878d625 100644
--- a/hosts/surtr/dns/default.nix
+++ b/hosts/surtr/dns/default.nix
@@ -169,15 +169,9 @@ in {
          { domain = "kleen.li";
            addACLs = { "kleen.li" = ["ymir_acme_acl"]; };
          }
-          { domain = "xmpp.li";
-            addACLs = { "xmpp.li" = ["ymir_acme_acl"]; };
-          }
          { domain = "synapse.li";
            acmeDomains = ["element.synapse.li" "turn.synapse.li" "synapse.li"];
          }
-          { domain = "dirty-haskell.org";
-            addACLs = { "dirty-haskell.org" = ["ymir_acme_acl"]; };
-          }
          { domain = "praseodym.org";
            addACLs = { "praseodym.org" = ["ymir_acme_acl"]; };
          }
diff --git a/hosts/surtr/dns/zones/li.xmpp.soa b/hosts/surtr/dns/zones/li.xmpp.soa
deleted file mode 100644
index a9e98fb4..00000000
--- a/hosts/surtr/dns/zones/li.xmpp.soa
+++ /dev/null
@@ -1,43 +0,0 @@
-$ORIGIN xmpp.li.
-$TTL 3600
-@ IN SOA ns.yggdrasil.li. hostmaster.yggdrasil.li (
-  2023013000 ; 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      CAA     128 issue "letsencrypt.org; validationmethods=dns-01"
-@                       IN      CAA     128 iodef "mailto:caa@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"
-*                       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"
-_acme-challenge         IN      NS      ns.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.
-_infinoted._tcp         IN      SRV     5 0 6523 ymir.yggdrasil.li.
-_submission._tcp        IN      SRV     5 0 25 ymir.yggdrasil.li.
-_imap._tcp              IN      SRV     5 0 143 ymir.yggdrasil.li.
-_imaps._tcp             IN      SRV     5 0 993 ymir.yggdrasil.li.
diff --git a/hosts/surtr/dns/zones/org.dirty-haskell.soa b/hosts/surtr/dns/zones/org.dirty-haskell.soa
deleted file mode 100644
index 27f0d7f9..00000000
--- a/hosts/surtr/dns/zones/org.dirty-haskell.soa
+++ /dev/null
@@ -1,34 +0,0 @@
-$ORIGIN dirty-haskell.org.
-$TTL 3600
-@ IN SOA ns.yggdrasil.li. hostmaster.yggdrasil.li (
-  2023013000 ; 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      CAA     128 issue "letsencrypt.org; validationmethods=dns-01"
-@                       IN      CAA     128 iodef "mailto:caa@yggdrasil.li"
-@                       IN      A       188.68.51.254
-@                       IN      AAAA    2a03:4000:6:d004::
-@                       IN      MX      10 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"
-_acme-challenge         IN      NS      ns.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=="
-)

diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix index 5dd60190..e878d625 100644 --- a/hosts/surtr/dns/default.nix +++ b/hosts/surtr/dns/default.nix
@@ -169,15 +169,9 @@ in {
169	{ domain = "kleen.li";	169	{ domain = "kleen.li";
170	addACLs = { "kleen.li" = ["ymir_acme_acl"]; };	170	addACLs = { "kleen.li" = ["ymir_acme_acl"]; };
171	}	171	}
172	{ domain = "xmpp.li";
173	addACLs = { "xmpp.li" = ["ymir_acme_acl"]; };
174	}
175	{ domain = "synapse.li";	172	{ domain = "synapse.li";
176	acmeDomains = ["element.synapse.li" "turn.synapse.li" "synapse.li"];	173	acmeDomains = ["element.synapse.li" "turn.synapse.li" "synapse.li"];
177	}	174	}
178	{ domain = "dirty-haskell.org";
179	addACLs = { "dirty-haskell.org" = ["ymir_acme_acl"]; };
180	}
181	{ domain = "praseodym.org";	175	{ domain = "praseodym.org";
182	addACLs = { "praseodym.org" = ["ymir_acme_acl"]; };	176	addACLs = { "praseodym.org" = ["ymir_acme_acl"]; };
183	}	177	}


diff --git a/hosts/surtr/dns/zones/li.xmpp.soa b/hosts/surtr/dns/zones/li.xmpp.soa deleted file mode 100644 index a9e98fb4..00000000 --- a/hosts/surtr/dns/zones/li.xmpp.soa +++ /dev/null
@@ -1,43 +0,0 @@
1	$ORIGIN xmpp.li.
2	$TTL 3600
3	@ IN SOA ns.yggdrasil.li. hostmaster.yggdrasil.li (
4	2023013000 ; 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
15	@ IN CAA 128 issue "letsencrypt.org; validationmethods=dns-01"
16	@ IN CAA 128 iodef "mailto:caa@yggdrasil.li"
17
18	@ IN A 188.68.51.254
19	@ IN AAAA 2a03:4000:6:d004::
20	@ IN MX 0 ymir.yggdrasil.li.
21	@ IN TXT "v=spf1 redirect=yggdrasil.li"
22
23	* IN A 188.68.51.254
24	* IN AAAA 2a03:4000:6:d004::
25	* IN MX 0 ymir.yggdrasil.li.
26	* IN TXT "v=spf1 redirect=yggdrasil.li"
27
28	_acme-challenge IN NS ns.yggdrasil.li.
29
30	ymir._domainkey IN TXT (
31	"v=DKIM1;k=rsa;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq3cCKlk+VPhyAanLZTM0BCzUT/+fmxHioZcFk0uJk1akBYj7BRofR7eVNcLKpm3rwYMQgE+9vJH9p8SV6tws9EcWc8SMCqqGZlREYM7PmLDiTSK/vjCzkygfgFCb0EBNsY2A/fpP4rTeoxrbcBSvMkq97iY5rwyw4wXZVZXLiDaCj23s8POoxTk1ClqUJZJQ5x2"
32	"qzrC0RfN5kLZ9A7Gq2jB09vNxpXHYqABA0bJv88JiZM7hfkp9IafJZ+yCVMaBcJs4DAxnTjNAuFD9gm+qSFVY8+yeXqL6Qjo5PbruhyZRBW8RgRYT8t5n07XRglMGKKGMwOGLanrltcyXqB+GsDZBD36RAAwjFadnxdpDyRv4SgRP7ff2tKRrORYpmpN+mKdqw5j3J/nP6bXV1oAkyh9XQkPEIDi81WT87EZziTElDzVp6A2qFOxqucAovoRk24"
33	"7vlsns1FApFRsp9mja0UZNObyKD1M6tP9Ep7lS76tFGMk+WDvXRJH5LEsyCpu7sSyl1r/O0M4K+KldRCqLlZd7rf8F5P8T0dn1azk05g7F4p0N/y9GNdzXbPZ9u0eZdI7SEdh8ZoOZp7NVZiBFfbWLSS5ZtyA2kbBa4i7GJ/cuAbEKOmqAkeQPiu96TGIcyjkXjS6mTPI+9UmKZYZC+OM8XdJ02y5KRoonCc19ZS8CAwEAAQ=="
34	)
35
36	_xmpp-client._tcp IN SRV 5 0 5222 ymir.yggdrasil.li.
37	_xmpp-server._tcp IN SRV 5 0 5269 ymir.yggdrasil.li.
38
39	_infinoted._tcp IN SRV 5 0 6523 ymir.yggdrasil.li.
40
41	_submission._tcp IN SRV 5 0 25 ymir.yggdrasil.li.
42	_imap._tcp IN SRV 5 0 143 ymir.yggdrasil.li.
43	_imaps._tcp IN SRV 5 0 993 ymir.yggdrasil.li.


diff --git a/hosts/surtr/dns/zones/org.dirty-haskell.soa b/hosts/surtr/dns/zones/org.dirty-haskell.soa deleted file mode 100644 index 27f0d7f9..00000000 --- a/hosts/surtr/dns/zones/org.dirty-haskell.soa +++ /dev/null
@@ -1,34 +0,0 @@
1	$ORIGIN dirty-haskell.org.
2	$TTL 3600
3	@ IN SOA ns.yggdrasil.li. hostmaster.yggdrasil.li (
4	2023013000 ; 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
15	@ IN CAA 128 issue "letsencrypt.org; validationmethods=dns-01"
16	@ IN CAA 128 iodef "mailto:caa@yggdrasil.li"
17
18	@ IN A 188.68.51.254
19	@ IN AAAA 2a03:4000:6:d004::
20	@ IN MX 10 ymir.yggdrasil.li.
21	@ IN TXT "v=spf1 redirect=yggdrasil.li"
22
23	* IN A 188.68.51.254
24	* IN AAAA 2a03:4000:6:d004::
25	* IN MX 0 ymir.yggdrasil.li.
26	* IN TXT "v=spf1 redirect=yggdrasil.li"
27
28	_acme-challenge IN NS ns.yggdrasil.li.
29
30	ymir._domainkey IN TXT (
31	"v=DKIM1;k=rsa;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq3cCKlk+VPhyAanLZTM0BCzUT/+fmxHioZcFk0uJk1akBYj7BRofR7eVNcLKpm3rwYMQgE+9vJH9p8SV6tws9EcWc8SMCqqGZlREYM7PmLDiTSK/vjCzkygfgFCb0EBNsY2A/fpP4rTeoxrbcBSvMkq97iY5rwyw4wXZVZXLiDaCj23s8POoxTk1ClqUJZJQ5x2"
32	"qzrC0RfN5kLZ9A7Gq2jB09vNxpXHYqABA0bJv88JiZM7hfkp9IafJZ+yCVMaBcJs4DAxnTjNAuFD9gm+qSFVY8+yeXqL6Qjo5PbruhyZRBW8RgRYT8t5n07XRglMGKKGMwOGLanrltcyXqB+GsDZBD36RAAwjFadnxdpDyRv4SgRP7ff2tKRrORYpmpN+mKdqw5j3J/nP6bXV1oAkyh9XQkPEIDi81WT87EZziTElDzVp6A2qFOxqucAovoRk24"
33	"7vlsns1FApFRsp9mja0UZNObyKD1M6tP9Ep7lS76tFGMk+WDvXRJH5LEsyCpu7sSyl1r/O0M4K+KldRCqLlZd7rf8F5P8T0dn1azk05g7F4p0N/y9GNdzXbPZ9u0eZdI7SEdh8ZoOZp7NVZiBFfbWLSS5ZtyA2kbBa4i7GJ/cuAbEKOmqAkeQPiu96TGIcyjkXjS6mTPI+9UmKZYZC+OM8XdJ02y5KRoonCc19ZS8CAwEAAQ=="
34	)