diff --git a/doh.mesh.nycmesh.net.zone b/doh.mesh.nycmesh.net.zone index dc83567..51c48b9 100644 --- a/doh.mesh.nycmesh.net.zone +++ b/doh.mesh.nycmesh.net.zone @@ -1,9 +1,9 @@ $TTL 3600 -@ SOA ( nycmesh-713-dns-auth-4 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) -@ NS nycmesh-713-dns-auth-4 +@ SOA ( nycmesh-713-dns-auth-3 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) +@ NS nycmesh-713-dns-auth-3 ; Authoritative DNS servers -nycmesh-713-dns-auth-4 A 199.170.132.47 +nycmesh-713-dns-auth-3 A 199.170.132.47 ; Recursive resolvers nycmesh-713-dns-rec-4 A 10.70.90.133 diff --git a/mesh.zone b/mesh.zone index 437e031..985a6df 100644 --- a/mesh.zone +++ b/mesh.zone @@ -2,6 +2,8 @@ $TTL 3600 @ SOA 10.10.10.11. hostmaster.nycmesh.net. ( 2019090700 1d 2h 4w 1h ) @ NS ns +@ NS nycmesh-713-dns-auth-3 +@ NS nycmesh-10-dns-auth-5 @ A 10.10.10.11 ; IPv4 address for example.com @ MX 10 mail @@ -11,7 +13,7 @@ $TTL 3600 dns A 10.10.10.10 ns A 10.10.10.11 nycmesh-10-dns-auth-5 A 23.158.16.23 -nycmesh-713-dns-auth-4 A 199.170.132.47 +nycmesh-713-dns-auth-3 A 199.170.132.47 nycmesh-713-jon-dns-auth-1 A 199.170.132.48 ebook A 10.70.129.51 something A 1.1.1.1 @@ -96,7 +98,7 @@ jamesprojects A 10.70.90.53 jmstemp A 199.170.132.45 ; doh -doh NS nycmesh-713-dns-auth-4 +doh NS nycmesh-713-dns-auth-3 ; David K emergency-dev A 10.70.90.161 diff --git a/nycmeshconnect.com.zone b/nycmeshconnect.com.zone index bfe0b66..7ec6b10 100644 --- a/nycmeshconnect.com.zone +++ b/nycmeshconnect.com.zone @@ -1,6 +1,7 @@ $TTL 3600 -@ SOA ( nycmesh-713-dns-auth-4 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) -@ NS nycmesh-713-dns-auth-4 +@ SOA ( nycmesh-713-dns-auth-3 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) +@ NS nycmesh-713-dns-auth-3 +@ NS nycmesh-10-dns-auth-5 ; GitHub Pages - https://github.com/nycmeshnet/connect-redirect @ A 185.199.108.153 @@ -10,4 +11,5 @@ $TTL 3600 www CNAME nycmeshnet.github.io ; Authoritative DNS servers -nycmesh-713-dns-auth-4 A 199.170.132.47 +nycmesh-713-dns-auth-3 A 199.170.132.47 +nycmesh-10-dns-auth-5 A 23.158.16.23 diff --git a/nycmeshconnect.net.zone b/nycmeshconnect.net.zone index aa927ee..424777c 100644 --- a/nycmeshconnect.net.zone +++ b/nycmeshconnect.net.zone @@ -1,6 +1,7 @@ $TTL 3600 -@ SOA ( nycmesh-713-dns-auth-4 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) -@ NS nycmesh-713-dns-auth-4 +@ SOA ( nycmesh-713-dns-auth-3 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) +@ NS nycmesh-713-dns-auth-3 +@ NS nycmesh-10-dns-auth-5 ; GitHub Pages - https://github.com/nycmeshnet/connect/blob/main/CNAME @ A 185.199.108.153 @@ -10,4 +11,5 @@ $TTL 3600 www CNAME nycmeshnet.github.io ; Authoritative DNS servers -nycmesh-713-dns-auth-4 A 199.170.132.47 +nycmesh-713-dns-auth-3 A 199.170.132.47 +nycmesh-10-dns-auth-5 A 23.158.16.23 diff --git a/sld/records.nycmesh.net.tf b/sld/records.nycmesh.net.tf index 7332dc3..bab4b76 100644 --- a/sld/records.nycmesh.net.tf +++ b/sld/records.nycmesh.net.tf @@ -185,7 +185,7 @@ resource "namedotcom_record" "record_nycmesh-375p-dns1-resolver_5233305" { answer = "199.167.59.10" } -# NS record for the mesh.nycmesh.net zone +# NS record for the authoritative server for mesh.nycmesh.net at SN1 resource "namedotcom_record" "record_mesh_5226462" { domain_name = "nycmesh.net" host = "mesh" @@ -201,12 +201,48 @@ resource "namedotcom_record" "record_nycmesh-375p-dns1-authoritative_5233306" { answer = "199.167.59.11" } +# NS record for the authoritative servers for mesh.nycmesh.net at SN3 + SN10 +# nycmesh-713-dns-auth-3 +# nycmesh-10-dns-auth-6 +resource "namedotcom_record" "mesh_ns_nycmesh-713-dns-auth-3" { + domain_name = "nycmesh.net" + host = "mesh" + record_type = "NS" + answer = "nycmesh-713-dns-auth-3.nycmesh.net" +} + +# Authoritative DNS server for the mesh.nycmesh.net zone at SN3 +resource "namedotcom_record" "nycmesh-713-dns-auth-3" { + domain_name = "nycmesh.net" + host = "nycmesh-713-dns-auth-3" + record_type = "A" + answer = "199.170.132.47" +} + +# Authoritative DNS server for the mesh.nycmesh.net zone at SN10 +resource "namedotcom_record" "nycmesh-10-dns-auth-6" { + domain_name = "nycmesh.net" + host = "nycmesh-10-dns-auth-6" + record_type = "A" + answer = "199.170.132.47" +} + +# NS record for the authoritative servers for mesh.nycmesh.net at SN10 + SN3 +# nycmesh-713-dns-auth-4 +# nycmesh-10-dns-auth-5 +resource "namedotcom_record" "mesh_ns_nycmesh-10-dns-auth-5" { + domain_name = "nycmesh.net" + host = "mesh" + record_type = "NS" + answer = "nycmesh-10-dns-auth-5.nycmesh.net" +} + # Authoritative DNS server for the mesh.nycmesh.net zone at SN3 resource "namedotcom_record" "nycmesh-713-dns-auth-4" { domain_name = "nycmesh.net" host = "nycmesh-713-dns-auth-4" record_type = "A" - answer = "199.170.132.47" + answer = "23.158.16.23" } # Authoritative DNS server for the mesh.nycmesh.net zone at SN10 diff --git a/sld/records.nycmeshconnect.com.tf b/sld/records.nycmeshconnect.com.tf index baf86f1..e5971cd 100644 --- a/sld/records.nycmeshconnect.com.tf +++ b/sld/records.nycmeshconnect.com.tf @@ -37,9 +37,17 @@ resource "namedotcom_record" "nycmeshconnect_com_www_cname" { } # Authoritative DNS server at SN3 -resource "namedotcom_record" "nycmesh-713-dns-auth-4-nycmeshconnect-com" { +resource "namedotcom_record" "nycmesh-713-dns-auth-3-nycmeshconnect-com" { domain_name = "nycmeshconnect.com" - host = "nycmesh-713-dns-auth-4" + host = "nycmesh-713-dns-auth-3" record_type = "A" answer = "199.170.132.47" } + +# Authoritative DNS server at SN10 +resource "namedotcom_record" "nycmesh-10-dns-auth-5-nycmeshconnect-com" { + domain_name = "nycmeshconnect.com" + host = "nycmesh-10-dns-auth-5" + record_type = "A" + answer = "23.158.16.23" +} diff --git a/sld/records.nycmeshconnect.net.tf b/sld/records.nycmeshconnect.net.tf index 505cc4a..f6bb864 100644 --- a/sld/records.nycmeshconnect.net.tf +++ b/sld/records.nycmeshconnect.net.tf @@ -37,9 +37,17 @@ resource "namedotcom_record" "nycmeshconnect_net_www_cname" { } # Authoritative DNS server at SN3 -resource "namedotcom_record" "nycmesh-713-dns-auth-4-nycmeshconnect-net" { +resource "namedotcom_record" "nycmesh-713-dns-auth-3-nycmeshconnect-net" { domain_name = "nycmeshconnect.net" - host = "nycmesh-713-dns-auth-4" + host = "nycmesh-713-dns-auth-3" record_type = "A" answer = "199.170.132.47" } + +# Authoritative DNS server at SN10 +resource "namedotcom_record" "nycmesh-10-dns-auth-5-nycmeshconnect-net" { + domain_name = "nycmeshconnect.net" + host = "nycmesh-10-dns-auth-5" + record_type = "A" + answer = "23.158.16.23" +} diff --git a/sld/records.themesh.nyc.tf b/sld/records.themesh.nyc.tf index 31683c2..4b30ce5 100644 --- a/sld/records.themesh.nyc.tf +++ b/sld/records.themesh.nyc.tf @@ -36,9 +36,17 @@ resource "namedotcom_record" "themesh_nyc_www_cname" { } # Authoritative DNS server at SN3 -resource "namedotcom_record" "nycmesh-713-dns-auth-4-themesh-nyc" { +resource "namedotcom_record" "nycmesh-713-dns-auth-3-themesh-nyc" { domain_name = "themesh.nyc" - host = "nycmesh-713-dns-auth-4" + host = "nycmesh-713-dns-auth-3" record_type = "A" answer = "199.170.132.47" } + +# Authoritative DNS server at SN10 +resource "namedotcom_record" "nycmesh-713-dns-auth-5-themesh-nyc" { + domain_name = "themesh.nyc" + host = "nycmesh-10-dns-auth-5" + record_type = "A" + answer = "23.158.16.23" +} diff --git a/themesh.nyc.zone b/themesh.nyc.zone index 03457c3..9f7b9d1 100644 --- a/themesh.nyc.zone +++ b/themesh.nyc.zone @@ -1,6 +1,7 @@ $TTL 3600 -@ SOA ( nycmesh-713-dns-auth-4 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) -@ NS nycmesh-713-dns-auth-4 +@ SOA ( nycmesh-713-dns-auth-3 hostmaster.nycmesh.net. 2024101000 1d 2h 4w 1h ) +@ NS nycmesh-713-dns-auth-3 +@ NS nycmesh-10-dns-auth-5 ; GitHub Pages - https://github.com/nycmeshnet/themesh.nyc/blob/main/CNAME @ A 185.199.108.153 @@ -10,4 +11,5 @@ $TTL 3600 www CNAME nycmeshnet.github.io ; Authoritative DNS servers -nycmesh-713-dns-auth-4 A 199.170.132.47 +nycmesh-713-dns-auth-3 A 199.170.132.47 +nycmesh-10-dns-auth-5 A 23.158.16.23