summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Harris <ben@tilde.team>2019-10-02 01:12:52 +0000
committerBen Harris <ben@tilde.team>2019-10-02 01:12:52 +0000
commite91a5a8ef928b03e2d319c0183a38dcf02c35aec (patch)
treed0b8af082a91e57fbe82c3fb0a39938bb33530a4
parent064dc2140f6948eb959b0bb3c2f87fa56daa9af8 (diff)
remove 72-79 .bhh.sh
-rw-r--r--named.conf.mydomains10
-rw-r--r--zones/db.fuckup.club4
-rw-r--r--zones/db.tilde.ninja45
-rw-r--r--zones/mydomains/db.ben.o18
-rw-r--r--zones/mydomains/db.bhh.sh10
5 files changed, 51 insertions, 36 deletions
diff --git a/named.conf.mydomains b/named.conf.mydomains
index 9518bdc..499bb4e 100644
--- a/named.conf.mydomains
+++ b/named.conf.mydomains
@@ -21,6 +21,16 @@ zone "benharr.is" {
 	};
 };
 
+zone "ben.o" {
+	type master;
+	file "/etc/bind/zones/mydomains/db.ben.o";
+	allow-transfer { 167.114.154.31; };
+	also-notify { 167.114.154.31; };
+	update-policy {
+		grant certbot name _acme-challenge.ben.o. txt;
+	};
+};
+
 zone "benharri.dev" {
 	type master;
 	file "/etc/bind/zones/mydomains/db.benharri.dev";
diff --git a/zones/db.fuckup.club b/zones/db.fuckup.club
index 2fc20c1..a646346 100644
--- a/zones/db.fuckup.club
+++ b/zones/db.fuckup.club
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 fuckup.club		IN SOA	ns1.tildeverse.net. root.fuckup.club. (
-				2031757538 ; serial
+				2031757542 ; serial
 				7200       ; refresh (2 hours)
 				3600       ; retry (1 hour)
 				86400      ; expire (1 day)
@@ -18,4 +18,4 @@ $ORIGIN fuckup.club.
 			AAAA	2607:5300:60:823f::48
 _dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@fuckup.club; sp=none; ri=86400"
 mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
-ownercheck      IN      TXT     "4b87cebc"
+ownercheck		TXT	"4b87cebc"
diff --git a/zones/db.tilde.ninja b/zones/db.tilde.ninja
index 2a4dc02..de81f92 100644
--- a/zones/db.tilde.ninja
+++ b/zones/db.tilde.ninja
@@ -1,26 +1,21 @@
+$ORIGIN .
+$TTL 3600	; 1 hour
+tilde.ninja		IN SOA	ns1.tildeverse.net. root.tilde.ninja. (
+				2031757474 ; serial
+				7200       ; refresh (2 hours)
+				3600       ; retry (1 hour)
+				86400      ; expire (1 day)
+				3600       ; minimum (1 hour)
+				)
+			NS	ns1.tildeverse.net.
+			NS	ns2.tildeverse.net.
+			A	51.79.32.48
+			MX	1 mail.tilde.team.
+			TXT	"v=spf1 a mx -all"
+			AAAA	2607:5300:60:823f::48
 $ORIGIN tilde.ninja.
-$TTL 3600
-
-;; SOA Record
-tilde.ninja.	3600	IN	SOA	ns1.tildeverse.net. root.tilde.ninja. 2031757470 7200 3600 86400 3600
-
-;; NS Records
-@       IN      NS      ns1.tildeverse.net.
-@       IN      NS      ns2.tildeverse.net.
-
-;; A Records
-*	IN	A	51.79.32.48
-@	IN	A	51.79.32.48
-
-;; AAAA Records
-*	IN	AAAA	2607:5300:60:823f::48
-@	IN	AAAA	2607:5300:60:823f::48
-
-;; MX Records
-@	IN	MX	1 mail.tilde.team.
-
-;; TXT Records
-_dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tilde.ninja; 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"
+*			A	51.79.32.48
+			AAAA	2607:5300:60:823f::48
+_dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tilde.ninja; sp=none; ri=86400"
+mail._domainkey		TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSw0wZVrHZCdOg3KgVJRuq3HpBudUZ8EJSZWLntQow4WlAxhN68SOKd1iUAtk6hGSznXuMiiJrNRrPUPeloviLIOovcU3LxIvd9gxQc9D7BkIbGHs4z5NpvCOTbGqvCLqc7z3rUu/kaf7nBqOSwQFDc4XrrnsK0e6AzKkn5qnQvwIDAQAB"
+ownercheck		TXT	"4b87cebc"
diff --git a/zones/mydomains/db.ben.o b/zones/mydomains/db.ben.o
new file mode 100644
index 0000000..f66891e
--- /dev/null
+++ b/zones/mydomains/db.ben.o
@@ -0,0 +1,18 @@
+$ORIGIN .
+$TTL 3600	; 1 hour
+ben.o			IN SOA	ns1.tildeverse.net. root.ben.o. (
+				2019093000 ; serial
+				7200       ; refresh (2 hours)
+				3600       ; retry (1 hour)
+				86400      ; expire (1 day)
+				3600       ; minimum (1 hour)
+				)
+			NS	ns1.tildeverse.net.
+			NS	ns2.tildeverse.net.
+			A	209.182.234.192
+			MX	1 benharr.is.
+			TXT	"v=spf1 a mx -all"
+$ORIGIN ben.o.
+*			A	209.182.234.192
+_dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@bhh.sh; 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"
diff --git a/zones/mydomains/db.bhh.sh b/zones/mydomains/db.bhh.sh
index e1c9713..6702004 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.tildeverse.net. root.bhh.sh. (
-				2019092300 ; serial
+				2019100100 ; serial
 				7200       ; refresh (2 hours)
 				3600       ; retry (1 hour)
 				86400      ; expire (1 day)
@@ -52,14 +52,6 @@ bsd			A	51.79.32.54
 61			A	51.79.32.61
 62			A	51.79.32.62
 63			A	51.79.32.63
-72			A	198.50.128.72
-73			A	198.50.128.73
-74			A	198.50.128.74
-75			A	198.50.128.75
-76			A	198.50.128.76
-77			A	198.50.128.77
-78			A	198.50.128.78
-79			A	198.50.128.79
 _dmarc			TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@bhh.sh; 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"
 cache			CNAME	mc.bhh.sh.