add irctokens.org, remove benharri.dev

10 files changed, 50 insertions, 35 deletions

diff --git a/zones/db.tild3.org b/zones/db.tild3.org
index 50f7531..40d637d 100644
--- a/zones/db.tild3.org
+++ b/zones/db.tild3.org
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tild3.org		IN SOA	ns1.tildeverse.net. root.tild3.org. (
-				2020041200 ; serial
+				2020041204 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -19,9 +19,9 @@ $ORIGIN tild3.org.
 _dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tild3.org; sp=none; ri=86400"
 mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
 fr			A	192.95.3.24
+			MX	1 fr
+			TXT	"v=spf1 mx -all"
 			AAAA	2607:5300:203:5fd5::24
-			MX  1   fr.tild3.org.
-			TXT "v=spf1 mx -all"
 $ORIGIN fr.tild3.org.
 *			A	192.95.3.24
 			AAAA	2607:5300:203:5fd5::24
diff --git a/zones/db.tilde.site b/zones/db.tilde.site
index ad2b2d7..5f5969e 100644
--- a/zones/db.tilde.site
+++ b/zones/db.tilde.site
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tilde.site		IN SOA	ns1.tildeverse.net. root.tilde.site. (
-				2020011504 ; serial
+				2020011508 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
diff --git a/zones/db.tilde.team b/zones/db.tilde.team
index 3f5cfe8..cca14a9 100644
--- a/zones/db.tilde.team
+++ b/zones/db.tilde.team
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tilde.team		IN SOA	ns1.tildeverse.net. root.tilde.team. (
-				2020021908 ; serial
+				2020021912 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
diff --git a/zones/db.tilde.wiki b/zones/db.tilde.wiki
index 186e0b4..bf1e786 100644
--- a/zones/db.tilde.wiki
+++ b/zones/db.tilde.wiki
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tilde.wiki		IN SOA	ns1.tildeverse.net. root.tilde.wiki. (
-				2020011504 ; serial
+				2020011508 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
diff --git a/zones/db.tildegit.org b/zones/db.tildegit.org
index d6f52ca..ac59b93 100644
--- a/zones/db.tildegit.org
+++ b/zones/db.tildegit.org
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tildegit.org		IN SOA	ns1.tildeverse.net. root.tildegit.org. (
-				2020050301 ; serial
+				2020050305 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -16,9 +16,9 @@ tildegit.org		IN SOA	ns1.tildeverse.net. root.tildegit.org. (
 $ORIGIN tildegit.org.
 *			A	167.114.7.65
 			AAAA	2607:5300:203:5fd5::7:65
-drone			A	192.95.3.20
 _dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tildegit.org; sp=none; ri=86400"
 mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
 _github-challenge-tilde-team TXT "5e2523609b"
+drone			A	192.95.3.20
 ownercheck		TXT	"17ad81f6"
 ssh			A	167.114.7.66
diff --git a/zones/db.tildeteam.org b/zones/db.tildeteam.org
index 24601b2..67ba4c1 100644
--- a/zones/db.tildeteam.org
+++ b/zones/db.tildeteam.org
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tildeteam.org		IN SOA	ns1.tildeverse.net. root.tildeteam.org. (
-				2020011504 ; serial
+				2020011508 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
diff --git a/zones/db.tildeverse.org b/zones/db.tildeverse.org
index 4379dbf..fd5b94e 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. (
-				2020050301 ; serial
+				2020050305 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -18,9 +18,11 @@ $ORIGIN tildeverse.org.
 _dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tildeverse.org; sp=none; ri=86400"
 mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
 banner			A	142.44.150.187
-$ORIGIN tildeverse.org.
 crawl			A	116.203.40.7
 			AAAA	2a01:4f8:1c1c:45b3::1
+factorio		A	51.79.32.57
+gotify			A	192.95.3.20
+jitsi			A	51.79.32.54
 lists			A	167.114.7.65
 			MX	1 mail.tilde.team.
 			TXT	"v=spf1 a mx -all"
@@ -31,7 +33,6 @@ _dmarc			TXT	"v=DMARC1; p=none; ruf=mailto:postmaster@tildeverse.org; sp=none; r
 mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
 $ORIGIN tildeverse.org.
 mc			A	192.95.3.28
-gotify			A	192.95.3.20
 $ORIGIN mc.tildeverse.org.
 *			A	192.95.3.28
 $ORIGIN tildeverse.org.
@@ -52,8 +53,6 @@ archive			A	96.51.20.5
 $ORIGIN tildeverse.org.
 search			A	149.56.184.113
 status			CNAME	tildeverse.github.io.
-jitsi			A	51.79.32.54
-factorio		A	51.79.32.57
 wallabag		CNAME	aussies.space.
 www			A	167.114.7.65
 			AAAA	2607:5300:203:5fd5::7:65
diff --git a/zones/mydomains/db.benharri.dev b/zones/mydomains/db.benharri.dev
deleted file mode 100644
index 772f3cf..0000000
--- a/zones/mydomains/db.benharri.dev
+++ /dev/null
@@ -1,20 +0,0 @@
-$ORIGIN .
-$TTL 3600	; 1 hour
-benharri.dev		IN SOA	ns1.bhh.sh. root.benharri.dev. (
-				2019122704 ; serial
-				86400      ; refresh (1 day)
-				7200       ; retry (2 hours)
-				3600000    ; expire (5 weeks 6 days 16 hours)
-				172800     ; minimum (2 days)
-				)
-			NS	ns1.bhh.sh.
-			NS	ns2.bhh.sh.
-			A	209.182.234.192
-			MX	1 benharr.is.
-			TXT	"v=spf1 mx a -all"
-$ORIGIN benharri.dev.
-*			A	209.182.234.192
-_dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@benharri.dev; sp=none; ri=86400"
-mail._domainkey		TXT	"v=DKIM1; h=sha256; k=rsa;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQE" "AnfLQMJIQjmt/PSkb1rz3z9z3bwvKlJdounLI0pHUleUNuvm3GjFMMMPAcZzQHroakx4Et" "jgS5tpRI1T5u7IYxXLRTGKIIlY6IwEC3EFRZ0+z0PSwSoNuhagESI5F5pUXBYCAQtIpCFu" "5hJE3IaYLbnAkrVgISp5MOSdZ+/GWI1Hpac0xVQhni/2s\" \"ZJl88hF6srUMyXZa89L5" "k/D24nehl+TArkf6fv0vyh3fcfSuri/aqAqCWKaVwgmPbHUht6Fjyqd3uhX14ZF5JJc2oF" "7en2QaVs97FAbSZVCl1pDozJWHytJnhZYI7k0C2TA9mkizFGxBP135mTFjDFGr7IXt8QIDAQAB"
-_github-challenge-benharri-forks TXT "1c02273663"
-ownercheck		TXT	"17ad81f6"
diff --git a/zones/mydomains/db.bhh.sh b/zones/mydomains/db.bhh.sh
index 3f5a3de..cda7e1a 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. (
-				2020050301 ; serial
+				2020050801 ; serial
 				7200       ; refresh (2 hours)
 				3600       ; retry (1 hour)
 				86400      ; expire (1 day)
@@ -114,6 +114,7 @@ _submission		SRV	0 1 587 bhh.sh.
 $ORIGIN bhh.sh.
 aussie			A	139.99.134.13
 docker			CNAME	20
+status			CNAME	epic-cray-42fa91.netlify.app.
 infra			A	51.79.77.213
 mc			A	192.95.3.26
 freya			A	199.241.136.113
diff --git a/zones/mydomains/db.irctokens.org b/zones/mydomains/db.irctokens.org
new file mode 100644
index 0000000..c3b1fe2
--- /dev/null
+++ b/zones/mydomains/db.irctokens.org
@@ -0,0 +1,35 @@
+$ORIGIN irctokens.org.
+$TTL 3600
+
+;; SOA Record
+irctokens.org.	3600	IN	SOA	ns1.bhh.sh. root.irctokens.org. (
+				2020051600 ; 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@irctokens.org; 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"
+