remove expired benhh.com and update MX records

11 files changed, 18 insertions, 63 deletions

diff --git a/named.conf.mydomains b/named.conf.mydomains
index 073fbb8..c8fac6d 100644
--- a/named.conf.mydomains
+++ b/named.conf.mydomains
@@ -46,16 +46,6 @@ zone "ben.o" {
 	};
 };
 
-zone "benhh.com" {
-	type master;
-	file "/etc/bind/zones/mydomains/db.benhh.com";
-	allow-transfer { ns2; };
-	also-notify { ns2; };
-	update-policy {
-		grant certbot name _acme-challenge.benhh.com. txt;
-	};
-};
-
 zone "bhh.sh" {
 	type master;
 	file "/etc/bind/zones/mydomains/db.bhh.sh";
diff --git a/zones/mydomains/db.ben.o b/zones/mydomains/db.ben.o
index 586b087..2fd8432 100644
--- a/zones/mydomains/db.ben.o
+++ b/zones/mydomains/db.ben.o
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 ben.o			IN SOA	ns1.bhh.sh. root.ben.o. (
-				2019122700 ; serial
+				2020111700 ; serial
                                 86400      ; refresh (24 hours)
                                 7200       ; retry (2 hour)
                                 3600000    ; expire (1000 hours)
@@ -10,7 +10,7 @@ ben.o			IN SOA	ns1.bhh.sh. root.ben.o. (
 			NS	ns1.bhh.sh.
 			NS	ns2.bhh.sh.
 			A	209.182.234.192
-			MX	1 benharr.is.
+			MX	1 mail.bhh.sh.
 			TXT	"v=spf1 a mx -all"
 $ORIGIN ben.o.
 *			A	209.182.234.192
diff --git a/zones/mydomains/db.benharr.is b/zones/mydomains/db.benharr.is
index a7d50b3..c4147e8 100644
--- a/zones/mydomains/db.benharr.is
+++ b/zones/mydomains/db.benharr.is
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 benharr.is		IN SOA	ns1.bhh.sh. root.benharr.is. (
-				2020051712 ; serial
+				2020111700 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -11,7 +11,7 @@ $TTL 86400	; 1 day
 			NS	ns1.bhh.sh.
 			NS	ns2.bhh.sh.
 			A	209.182.234.192
-			MX	10 benharr.is.
+			MX	10 mail.bhh.sh.
 			TXT	"v=spf1 a mx -all"
 			TXT	"keybase-site-verification=vl-YnJkL7JADjyXWa1zDBGdmAyYuy8O1aMC4SlQFj2w"
 $ORIGIN benharr.is.
diff --git a/zones/mydomains/db.benharri.com b/zones/mydomains/db.benharri.com
index f354b78..b9768c5 100644
--- a/zones/mydomains/db.benharri.com
+++ b/zones/mydomains/db.benharri.com
@@ -3,7 +3,7 @@ $TTL 3600
 
 ;; SOA Record
 benharri.com.	3600	IN	SOA	ns1.bhh.sh. root.benharri.com. (
-				2020091400 ; serial
+				2020111700 ; serial
                                 86400      ; refresh (24 hours)
                                 7200       ; retry (2 hour)
                                 3600000    ; expire (1000 hours)
@@ -24,7 +24,7 @@ benharri.com.	3600	IN	SOA	ns1.bhh.sh. root.benharri.com. (
 @	IN	A	209.182.234.192
 
 ;; MX Records
-@	IN	MX	1 benharr.is.
+@	IN	MX	1 mail.bhh.sh.
 
 ;; TXT Records
 @	IN	TXT	"v=spf1 a mx -all"
diff --git a/zones/mydomains/db.benharri.org b/zones/mydomains/db.benharri.org
index 327e4b9..ad7ae83 100644
--- a/zones/mydomains/db.benharri.org
+++ b/zones/mydomains/db.benharri.org
@@ -3,7 +3,7 @@ $TTL 3600
 
 ;; SOA Record
 benharri.org.	3600	IN	SOA	ns1.bhh.sh. root.benharri.org. (
-				2020091700 ; serial
+				2020111700 ; serial
                                 86400      ; refresh (24 hours)
                                 7200       ; retry (2 hour)
                                 3600000    ; expire (1000 hours)
@@ -24,7 +24,7 @@ benharri.org.	3600	IN	SOA	ns1.bhh.sh. root.benharri.org. (
 @	IN	A	209.182.234.192
 
 ;; MX Records
-@	IN	MX	1 benharr.is.
+@	IN	MX	1 mail.bhh.sh.
 
 ;; TXT Records
 @	IN	TXT	"v=spf1 a mx -all"
diff --git a/zones/mydomains/db.benhh.com b/zones/mydomains/db.benhh.com
deleted file mode 100644
index 9e04765..0000000
--- a/zones/mydomains/db.benhh.com
+++ /dev/null
@@ -1,35 +0,0 @@
-$ORIGIN benhh.com.
-$TTL 3600
-
-;; SOA Record
-benhh.com.	3600	IN	SOA	ns1.bhh.sh. root.benhh.com. (
-				2019122700 ; serial
-                                86400      ; refresh (24 hours)
-                                7200       ; retry (2 hour)
-                                3600000    ; expire (1000 hours)
-                                172800     ; minimum (2 days)
-				)
-
-;; NS Records
-@	IN	NS	ns1.bhh.sh.
-@	IN	NS	ns2.bhh.sh.
-
-;; A Records
-*	IN	A	209.182.234.192
-@	IN	A	209.182.234.192
-
-;; MX Records
-@	IN	MX	1 benharr.is.
-
-;; TXT Records
-@	IN	TXT	"v=spf1 a mx -all"
-_dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@benhh.com; sp=none; ri=86400"
-mail._domainkey IN      TXT     (
-        "v=DKIM1; h=sha256; k=rsa;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQE"
-        "AnfLQMJIQjmt/PSkb1rz3z9z3bwvKlJdounLI0pHUleUNuvm3GjFMMMPAcZzQHroakx4Et"
-        "jgS5tpRI1T5u7IYxXLRTGKIIlY6IwEC3EFRZ0+z0PSwSoNuhagESI5F5pUXBYCAQtIpCFu"
-        "5hJE3IaYLbnAkrVgISp5MOSdZ+/GWI1Hpac0xVQhni/2s\" \"ZJl88hF6srUMyXZa89L5"
-        "k/D24nehl+TArkf6fv0vyh3fcfSuri/aqAqCWKaVwgmPbHUht6Fjyqd3uhX14ZF5JJc2oF"
-        "7en2QaVs97FAbSZVCl1pDozJWHytJnhZYI7k0C2TA9mkizFGxBP135mTFjDFGr7IXt8QIDAQAB" )
-ownercheck      IN      TXT     "17ad81f6"
-
diff --git a/zones/mydomains/db.bhh.sh b/zones/mydomains/db.bhh.sh
index 0d12c5f..5ec6808 100644
--- a/zones/mydomains/db.bhh.sh
+++ b/zones/mydomains/db.bhh.sh
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 bhh.sh			IN SOA	ns1.bhh.sh. root.bhh.sh. (
-				2020111300 ; serial
+				2020111700 ; serial
 				7200       ; refresh (2 hours)
 				3600       ; retry (1 hour)
 				86400      ; expire (1 day)
@@ -10,7 +10,7 @@ bhh.sh			IN SOA	ns1.bhh.sh. root.bhh.sh. (
 			NS	ns1.bhh.sh.
 			NS	ns2.bhh.sh.
 			A	209.182.234.192
-			MX	1 benharr.is.
+			MX	1 mail.bhh.sh.
 			TXT	"v=spf1 a mx -all"
 			TXT	"keybase-site-verification=mw8SIPjYa-wdqQO-oVlkLPOLVq-X5FgDtmqkxi8LrEQ"
 			SSHFP	1 1 (
diff --git a/zones/mydomains/db.harris.team b/zones/mydomains/db.harris.team
index 69637db..65d656d 100644
--- a/zones/mydomains/db.harris.team
+++ b/zones/mydomains/db.harris.team
@@ -3,7 +3,7 @@ $TTL 3600
 
 ;; SOA Record
 harris.team.	3600	IN	SOA	ns1.bhh.sh. root.harris.team. (
-				2020050300 ; serial
+				2020111700 ; serial
                                 86400      ; refresh (24 hours)
                                 7200       ; retry (2 hour)
                                 3600000    ; expire (1000 hours)
@@ -19,7 +19,7 @@ harris.team.	3600	IN	SOA	ns1.bhh.sh. root.harris.team. (
 @	IN	A	209.182.234.192
 
 ;; MX Records
-@	IN	MX	10 benharr.is.
+@	IN	MX	10 mail.bhh.sh.
 
 ;; TXT Records
 _dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@harris.team; sp=none; ri=86400"
diff --git a/zones/mydomains/db.hmm.st b/zones/mydomains/db.hmm.st
index 83a0174..5a01e1f 100644
--- a/zones/mydomains/db.hmm.st
+++ b/zones/mydomains/db.hmm.st
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 hmm.st			IN SOA	ns1.bhh.sh. root.hmm.st. (
-				2020111600 ; serial
+				2020111700 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -10,7 +10,7 @@ hmm.st			IN SOA	ns1.bhh.sh. root.hmm.st. (
 			NS	ns1.bhh.sh.
 			NS	ns2.bhh.sh.
 			A	198.108.76.81
-			MX	1 benharr.is.
+			MX	1 mail.bhh.sh.
 			TXT	"v=spf1 a mx -all"
 $ORIGIN hmm.st.
 *			A	198.108.76.81
diff --git a/zones/mydomains/db.irctokens.org b/zones/mydomains/db.irctokens.org
index 8e4203b..5ae3f10 100644
--- a/zones/mydomains/db.irctokens.org
+++ b/zones/mydomains/db.irctokens.org
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 irctokens.org		IN SOA	ns1.bhh.sh. root.irctokens.org. (
-				2020051616 ; serial
+				2020111700 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -10,7 +10,7 @@ irctokens.org		IN SOA	ns1.bhh.sh. root.irctokens.org. (
 			NS	ns1.bhh.sh.
 			NS	ns2.bhh.sh.
 			A	209.182.234.192
-			MX	1 benharr.is.
+			MX	1 mail.bhh.sh.
 			TXT	"v=spf1 a mx -all"
 $ORIGIN irctokens.org.
 *			A	209.182.234.192
diff --git a/zones/mydomains/db.ittwsd.org b/zones/mydomains/db.ittwsd.org
index a0d1d61..7cd4c39 100644
--- a/zones/mydomains/db.ittwsd.org
+++ b/zones/mydomains/db.ittwsd.org
@@ -3,7 +3,7 @@ $TTL 3600
 
 ;; SOA Record
 ittwsd.org.	3600	IN	SOA	ns1.bhh.sh. root.harris.team. (
-				2020032000 ; serial
+				2020111700 ; serial
                                 86400      ; refresh (24 hours)
                                 7200       ; retry (2 hour)
                                 3600000    ; expire (1000 hours)
@@ -19,7 +19,7 @@ ittwsd.org.	3600	IN	SOA	ns1.bhh.sh. root.harris.team. (
 @	IN	A	209.182.234.192
 
 ;; MX Records
-@	IN	MX	10 benharr.is.
+@	IN	MX	10 mail.bhh.sh.
 
 ;; TXT Records
 _dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@ittwsd.org; sp=none; ri=86400"