summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--named.conf.local20
-rw-r--r--named.conf.mydomains10
-rw-r--r--zones/db.tild3.org2
-rw-r--r--zones/db.tilde.ninja21
-rw-r--r--zones/db.tilde.pizza33
-rw-r--r--zones/db.tilde.site2
-rw-r--r--zones/db.tildegit.org4
-rw-r--r--zones/db.tildenet.org2
-rw-r--r--zones/db.tildeteam.org2
-rw-r--r--zones/db.tildeverse.org4
-rw-r--r--zones/mydomains/db.benharri.org35
11 files changed, 53 insertions, 82 deletions
diff --git a/named.conf.local b/named.conf.local
index 2fd1700..8675389 100644
--- a/named.conf.local
+++ b/named.conf.local
@@ -130,26 +130,6 @@ zone "tilde.news" {
 	};
 };
 
-zone "tilde.ninja" {
-	type master;
-	file "/etc/bind/zones/db.tilde.ninja";
-	allow-transfer { "transferto"; };
-	also-notify { "notifylist"; };
-	update-policy {
-		grant certbot name _acme-challenge.tilde.ninja. txt;
-	};
-};
-
-zone "tilde.pizza" {
-	type master;
-	file "/etc/bind/zones/db.tilde.pizza";
-	allow-transfer { "transferto"; };
-	also-notify { "notifylist"; };
-	update-policy {
-		grant certbot name _acme-challenge.tilde.pizza. txt;
-	};
-};
-
 zone "tilderadio.org" {
 	type master;
 	file "/etc/bind/zones/db.tilderadio.org";
diff --git a/named.conf.mydomains b/named.conf.mydomains
index 38405b4..d3d877b 100644
--- a/named.conf.mydomains
+++ b/named.conf.mydomains
@@ -14,6 +14,16 @@ zone "benharri.com" {
 	};
 };
 
+zone "benharri.org" {
+	type master;
+	file "/etc/bind/zones/mydomains/db.benharri.org";
+	allow-transfer { ns2; };
+	also-notify { ns2; };
+	update-policy {
+		grant certbot name _acme-challenge.benharri.org. txt;
+	};
+};
+
 zone "benharr.is" {
 	type master;
 	file "/etc/bind/zones/mydomains/db.benharr.is";
diff --git a/zones/db.tild3.org b/zones/db.tild3.org
index 3d44c88..6d0602d 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. (
-				2020041208 ; serial
+				2020041212 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
diff --git a/zones/db.tilde.ninja b/zones/db.tilde.ninja
deleted file mode 100644
index b5d8a7a..0000000
--- a/zones/db.tilde.ninja
+++ /dev/null
@@ -1,21 +0,0 @@
-$ORIGIN .
-$TTL 3600	; 1 hour
-tilde.ninja		IN SOA	ns1.tildeverse.net. root.tilde.ninja. (
-				2020011516 ; 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.
-			A	167.114.7.65
-			MX	1 mail.tilde.team.
-			TXT	"v=spf1 a mx -all"
-			AAAA	2607:5300:203:5fd5::7:65
-$ORIGIN tilde.ninja.
-*			A	167.114.7.65
-			AAAA	2607:5300:203:5fd5::7:65
-_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	"17ad81f6"
diff --git a/zones/db.tilde.pizza b/zones/db.tilde.pizza
deleted file mode 100644
index e815ab2..0000000
--- a/zones/db.tilde.pizza
+++ /dev/null
@@ -1,33 +0,0 @@
-$ORIGIN tilde.pizza.
-$TTL 3600
-
-;; SOA Record
-tilde.pizza.	3600	IN	SOA	ns1.tildeverse.net. root.tilde.pizza. (
-				2020010500 ; 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	167.114.7.65
-@	IN	A	167.114.7.65
-
-;; AAAA Records
-*	IN	AAAA	2607:5300:203:5fd5::7:65
-@	IN	AAAA	2607:5300:203:5fd5::7:65
-
-;; MX Records
-@	IN	MX	1 mail.tilde.team.
-
-;; TXT Records
-_dmarc	IN	TXT	"v=DMARC1; p=reject; ruf=mailto:postmaster@tilde.pizza; 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.tilde.site b/zones/db.tilde.site
index 24008f5..b875e28 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. (
-				2020011512 ; serial
+				2020011516 ; 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 1497241..27d8a2c 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. (
-				2020072100 ; serial
+				2020072104 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -19,9 +19,9 @@ $ORIGIN tildegit.org.
 _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
 bot			A	167.114.155.188
 			AAAA	2607:5300:201:3100::e5d
+drone			A	192.95.3.20
 ownercheck		TXT	"17ad81f6"
 ssh			A	167.114.7.66
 			AAAA	2607:5300:203:5fd5::7:66
diff --git a/zones/db.tildenet.org b/zones/db.tildenet.org
index 41d89a6..feebfc7 100644
--- a/zones/db.tildenet.org
+++ b/zones/db.tildenet.org
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 3600	; 1 hour
 tildenet.org		IN SOA	ns1.tildeverse.net. root.tildenet.org. (
-				2020011768 ; serial
+				2020011844 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
diff --git a/zones/db.tildeteam.org b/zones/db.tildeteam.org
index 9584ad2..f784e76 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. (
-				2020011512 ; serial
+				2020011516 ; 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 26ba99a..b1b0a2a 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. (
-				2020072100 ; serial
+				2020072104 ; serial
 				86400      ; refresh (1 day)
 				7200       ; retry (2 hours)
 				3600000    ; expire (5 weeks 6 days 16 hours)
@@ -10,9 +10,9 @@ tildeverse.org		IN SOA	ns1.tildeverse.org. root.tildeverse.org. (
 			NS	ns1.tildeverse.net.
 			NS	ns2.tildeverse.net.
 			A	167.114.7.67
-			AAAA	2607:5300:203:5fd5::7:67
 			MX	10 mail.tilde.team.
 			TXT	"v=spf1 a mx -all"
+			AAAA	2607:5300:203:5fd5::7:67
 $ORIGIN tildeverse.org.
 *			A	167.114.7.65
 			AAAA	2607:5300:203:5fd5::7:65
diff --git a/zones/mydomains/db.benharri.org b/zones/mydomains/db.benharri.org
new file mode 100644
index 0000000..6e20502
--- /dev/null
+++ b/zones/mydomains/db.benharri.org
@@ -0,0 +1,35 @@
+$ORIGIN benharri.org.
+$TTL 3600
+
+;; SOA Record
+benharri.org.	3600	IN	SOA	ns1.bhh.sh. root.benharri.org. (
+				2020090700 ; 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@benharri.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"
+