From ae2e3fd78ed92e5156793d3a42257edb4a46e176 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Wed, 11 Dec 2019 09:36:14 -0500
Subject: [PATCH] remove tildenic.org

---
 named.conf.local        | 10 ----------
 zones/db.tildenic.org   | 35 -----------------------------------
 zones/db.tildeverse.org |  5 ++++-
 3 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 zones/db.tildenic.org

diff --git a/named.conf.local b/named.conf.local
index 97e0e73..07b6cb3 100644
--- a/named.conf.local
+++ b/named.conf.local
@@ -120,16 +120,6 @@ zone "tilde.news" {
 	};
 };
 
-zone "tildenic.org" {
-	type master;
-	file "/etc/bind/zones/db.tildenic.org";
-	allow-transfer { 167.114.154.31; key tilde_msT; };
-	also-notify { 167.114.154.31; 89.163.145.170; 78.31.64.115; };
-	update-policy {
-		grant certbot name _acme-challenge.tildenic.org. txt;
-	};
-};
-
 zone "tilde.ninja" {
 	type master;
 	file "/etc/bind/zones/db.tilde.ninja";
diff --git a/zones/db.tildenic.org b/zones/db.tildenic.org
deleted file mode 100644
index 32e30a5..0000000
--- a/zones/db.tildenic.org
+++ /dev/null
@@ -1,35 +0,0 @@
-$ORIGIN tildenic.org.
-$TTL 3600
-
-;; SOA Record
-tildenic.org.	3600	IN	SOA	ns1.tildeverse.net. root.tildenic.org. (
-				2019102701 ; serial
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
-				)
-
-;; NS Records
-@       IN      NS      ns1.tildeverse.net.
-@       IN      NS      ns2.tildeverse.net.
-
-;; A Records
-@	IN	A	149.56.184.114
-*	IN	A	149.56.184.114
-ns1	IN	A	139.59.215.24
-ns2	IN	A	213.239.234.117
-
-;; AAAA Records
-@	IN	AAAA	2607:5300:60:67b0::114
-*	IN	AAAA	2607:5300:60:67b0::114
-ns1	IN	AAAA	2a03:b0c0:3:d0::d91:5001
-
-;; MX Records
-@	IN	MX	1 mail.tilde.team.
-
-;; TXT Records
-_dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tildenic.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     "17ad81f6"
diff --git a/zones/db.tildeverse.org b/zones/db.tildeverse.org
index e1c7c07..919bd7f 100644
--- a/zones/db.tildeverse.org
+++ b/zones/db.tildeverse.org
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tildeverse.org		IN SOA	ns1.tildeverse.org. root.tildeverse.org. (
-				2019120100 ; serial
+				2019121101 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -19,6 +19,9 @@ _dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tildeverse.org; sp=none;
 mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
 banner			A	142.44.189.38
 nic			A	149.56.184.114
+ns1.nic			A	139.59.215.24
+ns1.nic			AAAA	2607:5300:60:67b0::11
+ns2.nic			A	213.239.234.117
 $ORIGIN banner.tildeverse.org.
 _cpanel-dcv-test-record	TXT	"_cpanel-dcv-test-record=_Uc7jlKuLShbcAf7kXlIcG0debZoo3l3zzQwhGpuNAnuav9LTogJI2CnwX8fOhLC"
 $ORIGIN tildeverse.org.