X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/f7172746811e016c34003b36bae15a49b2528c1c..926c3455993b0463b3e53126120a703e847de295:/src/openstreetmap.js?ds=sidebyside

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 3508887..eab6e9c 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -39,6 +39,30 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     ]
   }),
 
+  SPF_BUILDER({
+    label: "messages",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "noreply",
+    ttl: "1h",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
   SPF_BUILDER({
     label: "otrs",
     ttl: "1h",
@@ -62,9 +86,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     rua: [
       "mailto:openstreetmap-d@dmarc.report-uri.com"
     ],
-    ruf: [
-      "mailto:admins@openstreetmap.org"
-    ],
     failureOptions: 1
   }),
 
@@ -99,6 +120,51 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web servers and their aliases
 
+  A("spike-01", SPIKE01_IPV4),
+  AAAA("spike-01", SPIKE01_IPV6),
+  // A("@", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE01_IPV6, TTL("10m")),
+  // A("www", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE01_IPV6, TTL("10m")),
+  // A("api", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE01_IPV6, TTL("10m")),
+  // A("maps", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE01_IPV6, TTL("10m")),
+  // A("mapz", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE01_IPV6, TTL("10m")),
+  A("spike-01.dub", SPIKE01_INTERNAL),
+  A("spike-01.oob", SPIKE01_OOB),
+
+  A("spike-02", SPIKE02_IPV4),
+  AAAA("spike-02", SPIKE02_IPV6),
+  // A("@", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE02_IPV6, TTL("10m")),
+  // A("www", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE02_IPV6, TTL("10m")),
+  // A("api", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE02_IPV6, TTL("10m")),
+  // A("maps", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE02_IPV6, TTL("10m")),
+  // A("mapz", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE02_IPV6, TTL("10m")),
+  A("spike-02.dub", SPIKE02_INTERNAL),
+  A("spike-02.oob", SPIKE02_OOB),
+
+  A("spike-03", SPIKE03_IPV4),
+  AAAA("spike-03", SPIKE03_IPV6),
+  // A("@", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE03_IPV6, TTL("10m")),
+  // A("www", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE03_IPV6, TTL("10m")),
+  // A("api", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE03_IPV6, TTL("10m")),
+  // A("maps", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE03_IPV6, TTL("10m")),
+  // A("mapz", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE03_IPV6, TTL("10m")),
+  A("spike-03.dub", SPIKE03_INTERNAL),
+  A("spike-03.oob", SPIKE03_OOB),
+
   A("spike-04", SPIKE04_IPV4),
   AAAA("spike-04", SPIKE04_IPV6),
   // A("@", SPIKE04_IPV4, TTL("10m")),
@@ -233,6 +299,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ysera.ucl", YSERA_INTERNAL),
   A("ysera.oob", YSERA_OOB),
 
+  A("culebre", CULEBRE_IPV4),
+  AAAA("culebre", CULEBRE_IPV6),
+  A("culebre.dub", CULEBRE_INTERNAL),
+  A("culebre.oob", CULEBRE_OOB),
+
+  A("nidhogg", NIDHOGG_IPV4),
+  AAAA("nidhogg", NIDHOGG_IPV6),
+  A("nidhogg.oob", NIDHOGG_OOB),
+
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 
@@ -252,10 +327,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 
-  CNAME("tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  CNAME("a.tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  CNAME("b.tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  CNAME("c.tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
+  CNAME("tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
+  CNAME("a.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
+  CNAME("b.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
+  CNAME("c.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
 
   // Services machine
 
@@ -270,6 +345,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
+  A("norbert", NORBERT_IPV4),
+  AAAA("norbert", NORBERT_IPV6),
+  // A("backup", NORBERT_IPV4, TTL("10m")),
+  // AAAA("backup", NORBERT_IPV6, TTL("10m")),
+  // A("planet", NORBERT_IPV4, TTL("10m")),
+  // AAAA("planet", NORBERT_IPV6, TTL("10m")),
+  A("norbert.ams", NORBERT_INTERNAL),
+  A("norbert.oob", NORBERT_OOB),
+
+  A("fafnir", FAFNIR_IPV4),
+  AAAA("fafnir", FAFNIR_IPV6),
+  // A("backup", FAFNIR_IPV4, TTL("10m")),
+  // AAAA("backup", FAFNIR_IPV6, TTL("10m")),
+  // A("planet", FAFNIR_IPV4, TTL("10m")),
+  // AAAA("planet", FAFNIR_IPV6, TTL("10m")),
+  A("fafnir.dub", FAFNIR_INTERNAL),
+  A("fafnir.oob", FAFNIR_OOB),
+
+  A("horntail", HORNTAIL_IPV4),
+  AAAA("horntail", HORNTAIL_IPV6),
+  // A("backup", HORNTAIL_IPV4, TTL("10m")),
+  // AAAA("backup", HORNTAIL_IPV6, TTL("10m")),
+  // A("planet", HORNTAIL_IPV4, TTL("10m")),
+  // AAAA("planet", HORNTAIL_IPV6, TTL("10m")),
+  A("horntail.dub", HORNTAIL_INTERNAL),
+  A("horntail.oob", HORNTAIL_OOB),
+
   A("grisu", GRISU_IPV4),
   AAAA("grisu", GRISU_IPV6),
   // A("backup", GRISU_IPV4, TTL("10m")),
@@ -287,6 +389,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("snap-02.ucl", SNAP02_INTERNAL),
   A("snap-02.oob", SNAP02_OOB),
 
+  A("snap-03.dub", SNAP03_INTERNAL),
+  A("snap-03.oob", SNAP03_OOB),
+
   A("karm.ams", KARM_INTERNAL),
   A("karm.oob", KARM_OOB),
 
@@ -389,10 +494,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("clifford.ucl", CLIFFORD_INTERNAL),
   A("clifford.oob", CLIFFORD_OOB),
 
-  // Discourse server
+  // Discourse server ("community")
 
   A("lockheed", LOCKHEED_IPV4),
   AAAA("lockheed", LOCKHEED_IPV6),
+  A("community", LOCKHEED_IPV4),
+  AAAA("community", LOCKHEED_IPV6),
   A("lockheed.ams", LOCKHEED_INTERNAL),
   A("lockheed.oob", LOCKHEED_OOB),
 
@@ -402,13 +509,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Managed network switches
 
-  A("switch1", SWITCH1_IPV4),
-  AAAA("switch1", SWITCH1_IPV6),
+  A("switch1.ams", SWITCH1AMS_IPV4),
+  AAAA("switch1.ams", SWITCH1AMS_IPV6),
+
+  A("switch1.dub", SWITCH1DUB_IPV4),
+  AAAA("switch1.dub", SWITCH1DUB_IPV6),
 
   // Managed power strips
 
-  A("pdu1.ams", PDU1_INTERNAL),
-  A("pdu2.ams", PDU2_INTERNAL),
+  A("pdu1.ams", PDU1AMS_INTERNAL),
+  A("pdu2.ams", PDU2AMS_INTERNAL),
+
+  A("pdu1.dub", PDU1DUB_INTERNAL),
+  A("pdu2.dub", PDU2DUB_INTERNAL),
+
+  // Out of band access servers
+
+  A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
 
@@ -441,6 +558,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("tabaluga.ams", TABALUGA_INTERNAL),
   A("tabaluga.oob", TABALUGA_OOB),
 
+  // Overpass server
+
+  A("gorwen", GORWEN_IPV4),
+  AAAA("gorwen", GORWEN_IPV6),
+  A("query", GORWEN_IPV4, TTL("10m")),
+  AAAA("query", GORWEN_IPV6, TTL("10m")),
+  A("gorwen.dub", GORWEN_INTERNAL),
+  A("gorwen.oob", GORWEN_OOB),
+
   // GPS tile server
 
   A("noquiklos", NOQUIKLOS_IPV4),
@@ -465,8 +591,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridgeback.oob", RIDGEBACK_OOB),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
-  A("longma", LONGMA_IPV4),
-  AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),
   AAAA("viserion", VISERION_IPV6),
   A("drogon", DROGON_IPV4),
@@ -475,35 +599,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("saphira", SAPHIRA_IPV6),
   A("toothless", TOOTHLESS_IPV4),
   AAAA("toothless", TOOTHLESS_IPV6),
-  A("sarkany", SARKANY_IPV4),
-  AAAA("sarkany", SARKANY_IPV6),
-  A("kalessin", KALESSIN_IPV4),
-  AAAA("kalessin", KALESSIN_IPV6),
   A("angor", ANGOR_IPV4),
   // AAAA("angor", ANGOR_IPV6),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),
-  A("cherufe", CHERUFE_IPV4),
   A("chrysophylax", CHRYSOPHYLAX_IPV4),
   AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
-  A("keizer", KEIZER_IPV4),
-  AAAA("keizer", KEIZER_IPV6),
   A("vipertooth", VIPERTOOTH_IPV4),
   AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("nidhogg", NIDHOGG_IPV4),
-  AAAA("nidhogg", NIDHOGG_IPV6),
-  A("boitata", BOITATA_IPV4),
-  AAAA("boitata", BOITATA_IPV6),
   A("fume", FUME_IPV4),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
   A("neak", NEAK_IPV4),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
-  A("kokosnuss", KOKOSNUSS_IPV4),
-  A("shruikan", SHRUIKAN_IPV4),
-  AAAA("shruikan", SHRUIKAN_IPV6),
   A("firnen", FIRNEN_IPV4),
 
   // Blades
@@ -547,6 +657,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Spare
 
+  A("idris", IDRIS_IPV4),
+  AAAA("idris", IDRIS_IPV6),
+  A("idris.dub", IDRIS_INTERNAL),
+  A("idris.oob", IDRIS_OOB),
+  A("konqi", KONQI_IPV4),
+  AAAA("konqi", KONQI_IPV6),
+  A("konqi.dub", KONQI_INTERNAL),
+  A("konqi.oob", KONQI_OOB),
+  A("naga", NAGA_IPV4),
+  AAAA("naga", NAGA_IPV6),
+  A("naga.dub", NAGA_INTERNAL),
+  A("naga.oob", NAGA_OOB),
+  A("jakelong", JAKELONG_IPV4),
+  AAAA("jakelong", JAKELONG_IPV6),
+  A("jakelong.dub", JAKELONG_INTERNAL),
+  A("jakelong.oob", JAKELONG_OOB),
 
   // Donation site