From 3ed841c946cba6d4be8a13ea0666228517f5340d Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Mon, 21 Oct 2019 14:02:22 +0000
Subject: [PATCH] nsupdate formatted some stuff

---
 zones/db.tildenet.org           | 10 +++----
 zones/db.tilderadio.org         | 49 ++++++++++++++-------------------
 zones/db.tildeverse.net         | 12 ++++----
 zones/mydomains/db.benharr.is   | 10 +++----
 zones/mydomains/db.benharri.dev | 10 +++----
 5 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/zones/db.tildenet.org b/zones/db.tildenet.org
index 440e6d5..12ad0f8 100644
--- a/zones/db.tildenet.org
+++ b/zones/db.tildenet.org
@@ -1,11 +1,11 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tildenet.org		IN SOA	ns1.tildeverse.net. root.tildenet.org. (
-				2019101700 ; serial
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
+				2019101704 ; serial
+				86400      ; refresh (1 day)
+				7200       ; retry (2 hours)
+				3600000    ; expire (5 weeks 6 days 16 hours)
+				172800     ; minimum (2 days)
 				)
 			NS	ns1.tildeverse.net.
 			NS	ns2.tildeverse.net.
diff --git a/zones/db.tilderadio.org b/zones/db.tilderadio.org
index f6dbfa4..f260849 100644
--- a/zones/db.tilderadio.org
+++ b/zones/db.tilderadio.org
@@ -1,30 +1,21 @@
-$ORIGIN tilderadio.org.
-$TTL 3600
-
-;; SOA Record
-tilderadio.org.	3600	IN	SOA	ns1.tildeverse.net. root.tilderadio.org. (
-				2019101700 ; serial 
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
+$ORIGIN .
+$TTL 3600	; 1 hour
+tilderadio.org		IN SOA	ns1.tildeverse.net. root.tilderadio.org. (
+				2019101704 ; serial
+				86400      ; refresh (1 day)
+				7200       ; retry (2 hours)
+				3600000    ; expire (5 weeks 6 days 16 hours)
+				172800     ; minimum (2 days)
 				)
-
-;; NS Records
-@       IN      NS      ns1.tildeverse.net.
-@       IN      NS      ns2.tildeverse.net.
-
-;; A Records
-@	IN	A	142.44.189.38
-*	IN	A	142.44.189.38
-archive	IN	A	51.79.32.52
-archive	IN	AAAA	2607:5300:60:823f::52
-
-;; MX Records
-@	IN	MX	1 mail.tilde.team.
-
-;; TXT Records
-_dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tilderadio.org; sp=none; ri=86400"
-mail._domainkey	IN	TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
-@	IN	TXT	"v=spf1 a mx -all"
-ownercheck      IN      TXT     "4b87cebc"
+			NS	ns1.tildeverse.net.
+			NS	ns2.tildeverse.net.
+			A	142.44.189.38
+			MX	1 mail.tilde.team.
+			TXT	"v=spf1 a mx -all"
+$ORIGIN tilderadio.org.
+*			A	142.44.189.38
+_dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tilderadio.org; sp=none; ri=86400"
+mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
+archive			A	51.79.32.52
+			AAAA	2607:5300:60:823f::52
+ownercheck		TXT	"4b87cebc"
diff --git a/zones/db.tildeverse.net b/zones/db.tildeverse.net
index 0bb3c18..3a5711e 100644
--- a/zones/db.tildeverse.net
+++ b/zones/db.tildeverse.net
@@ -1,11 +1,11 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tildeverse.net		IN SOA	ns1.tildeverse.net. root.tildeverse.net. (
-				2019101700 ; serial
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
+				2019101704 ; serial
+				86400      ; refresh (1 day)
+				7200       ; retry (2 hours)
+				3600000    ; expire (5 weeks 6 days 16 hours)
+				172800     ; minimum (2 days)
 				)
 			NS	ns1.tildeverse.net.
 			NS	ns2.tildeverse.net.
@@ -22,7 +22,7 @@ chat			CNAME	irc.tilde.chat.
 irc			CNAME	irc.tilde.chat.
 news			A	142.44.189.34
 ns1			A	51.79.32.63
-			AAAA	2607:5300:60:823f::63
 			MX	1 mail.tilde.team.
+			AAAA	2607:5300:60:823f::63
 ns2			A	167.114.154.31
 ownercheck		TXT	"4b87cebc"
diff --git a/zones/mydomains/db.benharr.is b/zones/mydomains/db.benharr.is
index 7088565..38a6f04 100644
--- a/zones/mydomains/db.benharr.is
+++ b/zones/mydomains/db.benharr.is
@@ -1,11 +1,11 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 benharr.is		IN SOA	ns1.tildeverse.net. root.benharr.is. (
-				2019101700 ; serial
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
+				2019101704 ; serial
+				86400      ; refresh (1 day)
+				7200       ; retry (2 hours)
+				3600000    ; expire (5 weeks 6 days 16 hours)
+				172800     ; minimum (2 days)
 				)
 $TTL 86400	; 1 day
 			NS	ns1.tildeverse.net.
diff --git a/zones/mydomains/db.benharri.dev b/zones/mydomains/db.benharri.dev
index b983e17..e3ae21a 100644
--- a/zones/mydomains/db.benharri.dev
+++ b/zones/mydomains/db.benharri.dev
@@ -1,11 +1,11 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 benharri.dev		IN SOA	ns1.tildeverse.net. root.benharri.dev. (
-				2019101700 ; serial
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
+				2019101706 ; serial
+				86400      ; refresh (1 day)
+				7200       ; retry (2 hours)
+				3600000    ; expire (5 weeks 6 days 16 hours)
+				172800     ; minimum (2 days)
 				)
 			NS	ns1.tildeverse.net.
 			NS	ns2.tildeverse.net.