]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
Revert "Add temporary addresses for juniper switch in Amsterdam"
[dns.git] / src / openstreetmap.js
index f47841d48c7251f44dbb08f7cae41eef8a709586..102cd8f7ec741fa5c1598750fb9d3a72aa822e7e 100644 (file)
@@ -30,11 +30,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "@",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
       "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -42,11 +43,12 @@ 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
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -54,11 +56,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "noreply",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
       "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -66,11 +69,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "otrs",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
       "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -78,11 +82,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "community",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
       "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -128,142 +133,124 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   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("@", SPIKE01_IPV4),
+  // AAAA("@", SPIKE01_IPV6),
+  // A("www", SPIKE01_IPV4),
+  // AAAA("www", SPIKE01_IPV6),
+  // A("api", SPIKE01_IPV4),
+  // AAAA("api", SPIKE01_IPV6),
+  // A("maps", SPIKE01_IPV4),
+  // AAAA("maps", SPIKE01_IPV6),
+  // A("mapz", SPIKE01_IPV4),
+  // AAAA("mapz", SPIKE01_IPV6),
   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("@", SPIKE02_IPV4),
+  // AAAA("@", SPIKE02_IPV6),
+  // A("www", SPIKE02_IPV4),
+  // AAAA("www", SPIKE02_IPV6),
+  // A("api", SPIKE02_IPV4),
+  // AAAA("api", SPIKE02_IPV6),
+  // A("maps", SPIKE02_IPV4),
+  // AAAA("maps", SPIKE02_IPV6),
+  // A("mapz", SPIKE02_IPV4),
+  // AAAA("mapz", SPIKE02_IPV6),
   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("@", SPIKE03_IPV4),
+  // AAAA("@", SPIKE03_IPV6),
+  // A("www", SPIKE03_IPV4),
+  // AAAA("www", SPIKE03_IPV6),
+  // A("api", SPIKE03_IPV4),
+  // AAAA("api", SPIKE03_IPV6),
+  // A("maps", SPIKE03_IPV4),
+  // AAAA("maps", SPIKE03_IPV6),
+  // A("mapz", SPIKE03_IPV4),
+  // AAAA("mapz", SPIKE03_IPV6),
   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")),
-  // AAAA("@", SPIKE04_IPV6, TTL("10m")),
-  // A("www", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE04_IPV6, TTL("10m")),
-  // A("api", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE04_IPV6, TTL("10m")),
-  // A("maps", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE04_IPV6, TTL("10m")),
-  // A("mapz", SPIKE04_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE04_IPV6, TTL("10m")),
+  // A("@", SPIKE04_IPV4),
+  // AAAA("@", SPIKE04_IPV6),
+  // A("www", SPIKE04_IPV4),
+  // AAAA("www", SPIKE04_IPV6),
+  // A("api", SPIKE04_IPV4),
+  // AAAA("api", SPIKE04_IPV6),
+  // A("maps", SPIKE04_IPV4),
+  // AAAA("maps", SPIKE04_IPV6),
+  // A("mapz", SPIKE04_IPV4),
+  // AAAA("mapz", SPIKE04_IPV6),
   A("spike-04.bm", SPIKE04_INTERNAL),
   A("spike-04.oob", SPIKE04_OOB),
 
   A("spike-05", SPIKE05_IPV4),
   AAAA("spike-05", SPIKE05_IPV6),
-  // A("@", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("@", SPIKE05_IPV6, TTL("10m")),
-  // A("www", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE05_IPV6, TTL("10m")),
-  // A("api", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE05_IPV6, TTL("10m")),
-  // A("maps", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE05_IPV6, TTL("10m")),
-  // A("mapz", SPIKE05_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE05_IPV6, TTL("10m")),
+  // A("@", SPIKE05_IPV4),
+  // AAAA("@", SPIKE05_IPV6),
+  // A("www", SPIKE05_IPV4),
+  // AAAA("www", SPIKE05_IPV6),
+  // A("api", SPIKE05_IPV4),
+  // AAAA("api", SPIKE05_IPV6),
+  // A("maps", SPIKE05_IPV4),
+  // AAAA("maps", SPIKE05_IPV6),
+  // A("mapz", SPIKE05_IPV4),
+  // AAAA("mapz", SPIKE05_IPV6),
   A("spike-05.bm", SPIKE05_INTERNAL),
   A("spike-05.oob", SPIKE05_OOB),
 
   A("spike-06", SPIKE06_IPV4),
   AAAA("spike-06", SPIKE06_IPV6),
-  A("@", SPIKE06_IPV4, TTL("10m")),
-  AAAA("@", SPIKE06_IPV6, TTL("10m")),
-  A("www", SPIKE06_IPV4, TTL("10m")),
-  AAAA("www", SPIKE06_IPV6, TTL("10m")),
-  A("api", SPIKE06_IPV4, TTL("10m")),
-  AAAA("api", SPIKE06_IPV6, TTL("10m")),
-  A("maps", SPIKE06_IPV4, TTL("10m")),
-  AAAA("maps", SPIKE06_IPV6, TTL("10m")),
-  A("mapz", SPIKE06_IPV4, TTL("10m")),
-  AAAA("mapz", SPIKE06_IPV6, TTL("10m")),
+  A("@", SPIKE06_IPV4),
+  AAAA("@", SPIKE06_IPV6),
+  A("www", SPIKE06_IPV4),
+  AAAA("www", SPIKE06_IPV6),
+  A("api", SPIKE06_IPV4),
+  AAAA("api", SPIKE06_IPV6),
+  A("maps", SPIKE06_IPV4),
+  AAAA("maps", SPIKE06_IPV6),
+  A("mapz", SPIKE06_IPV4),
+  AAAA("mapz", SPIKE06_IPV6),
   A("spike-06.ams", SPIKE06_INTERNAL),
   A("spike-06.oob", SPIKE06_OOB),
 
   A("spike-07", SPIKE07_IPV4),
   AAAA("spike-07", SPIKE07_IPV6),
-  A("@", SPIKE07_IPV4, TTL("10m")),
-  AAAA("@", SPIKE07_IPV6, TTL("10m")),
-  A("www", SPIKE07_IPV4, TTL("10m")),
-  AAAA("www", SPIKE07_IPV6, TTL("10m")),
-  A("api", SPIKE07_IPV4, TTL("10m")),
-  AAAA("api", SPIKE07_IPV6, TTL("10m")),
-  A("maps", SPIKE07_IPV4, TTL("10m")),
-  AAAA("maps", SPIKE07_IPV6, TTL("10m")),
-  A("mapz", SPIKE07_IPV4, TTL("10m")),
-  AAAA("mapz", SPIKE07_IPV6, TTL("10m")),
+  A("@", SPIKE07_IPV4),
+  AAAA("@", SPIKE07_IPV6),
+  A("www", SPIKE07_IPV4),
+  AAAA("www", SPIKE07_IPV6),
+  A("api", SPIKE07_IPV4),
+  AAAA("api", SPIKE07_IPV6),
+  A("maps", SPIKE07_IPV4),
+  AAAA("maps", SPIKE07_IPV6),
+  A("mapz", SPIKE07_IPV4),
+  AAAA("mapz", SPIKE07_IPV6),
   A("spike-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 
   A("spike-08", SPIKE08_IPV4),
   AAAA("spike-08", SPIKE08_IPV6),
-  // A("@", SPIKE08_IPV4, TTL("10m")),
-  // AAAA("@", SPIKE08_IPV6, TTL("10m")),
-  // A("www", SPIKE08_IPV4, TTL("10m")),
-  // AAAA("www", SPIKE08_IPV6, TTL("10m")),
-  // A("api", SPIKE08_IPV4, TTL("10m")),
-  // AAAA("api", SPIKE08_IPV6, TTL("10m")),
-  // A("maps", SPIKE08_IPV4, TTL("10m")),
-  // AAAA("maps", SPIKE08_IPV6, TTL("10m")),
-  // A("mapz", SPIKE08_IPV4, TTL("10m")),
-  // AAAA("mapz", SPIKE08_IPV6, TTL("10m")),
+  A("@", SPIKE08_IPV4),
+  AAAA("@", SPIKE08_IPV6),
+  A("www", SPIKE08_IPV4),
+  AAAA("www", SPIKE08_IPV6),
+  A("api", SPIKE08_IPV4),
+  AAAA("api", SPIKE08_IPV6),
+  A("maps", SPIKE08_IPV4),
+  AAAA("maps", SPIKE08_IPV6),
+  A("mapz", SPIKE08_IPV4),
+  AAAA("mapz", SPIKE08_IPV6),
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
-  // Rails application servers
-
-  A("thorn-02.ams", THORN02_INTERNAL),
-  A("rails2.ams", THORN02_INTERNAL),
-  A("thorn-02.oob", THORN02_OOB),
-
-  A("thorn-03.ams", THORN03_INTERNAL),
-  A("rails3.ams", THORN03_INTERNAL),
-  A("thorn-03.oob", THORN03_OOB),
-
-  A("thorn-04.bm", THORN04_INTERNAL),
-  A("rails4.bm", THORN04_INTERNAL),
-  A("thorn-04.oob", THORN04_OOB),
-
-  A("thorn-05.bm", THORN05_INTERNAL),
-  A("rails5.bm", THORN05_INTERNAL),
-  A("thorn-05.oob", THORN05_OOB),
-
   // Nominatim servers
 
   A("pummelzacken", PUMMELZACKEN_IPV4),
@@ -338,8 +325,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
-  // Fastly DNS based ACME Challenge requirement
-  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
 
   A("render", CULEBRE_IPV4),
   A("render", NIDHOGG_IPV4),
@@ -417,16 +402,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Development server with wildcard alias for user sites
 
-  A("errol", ERROL_IPV4),
-  A("dev", ERROL_IPV4),
-  A("*.dev", ERROL_IPV4),
-  A("ooc", ERROL_IPV4),
-  A("a.ooc", ERROL_IPV4),
-  A("b.ooc", ERROL_IPV4),
-  A("c.ooc", ERROL_IPV4),
-  A("npe", ERROL_IPV4),
-  A("errol.ucl", ERROL_INTERNAL),
-  A("errol.oob", ERROL_OOB),
+  A("faffy", FAFFY_IPV4),
+  AAAA("faffy", FAFFY_IPV6),
+  A("dev", FAFFY_IPV4),
+  AAAA("dev", FAFFY_IPV6),
+  A("*.dev", FAFFY_IPV4),
+  AAAA("*.dev", FAFFY_IPV6),
+  A("ooc", FAFFY_IPV4),
+  AAAA("ooc", FAFFY_IPV6),
+  A("a.ooc", FAFFY_IPV4),
+  AAAA("a.ooc", FAFFY_IPV6),
+  A("b.ooc", FAFFY_IPV4),
+  AAAA("b.ooc", FAFFY_IPV6),
+  A("c.ooc", FAFFY_IPV4),
+  AAAA("c.ooc", FAFFY_IPV6),
+  A("npe", FAFFY_IPV4),
+  AAAA("npe", FAFFY_IPV6),
+  A("faffy.ams", FAFFY_INTERNAL),
+  A("faffy.oob", FAFFY_OOB),
 
   // Foundation server
 
@@ -439,9 +432,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
-  // Piwik server
+  // Matomo server
 
   A("eustace", EUSTACE_IPV4),
+  A("matomo", EUSTACE_IPV4),
   A("piwik", EUSTACE_IPV4),
   A("eustace.ucl", EUSTACE_INTERNAL),
   A("eustace.oob", EUSTACE_OOB),
@@ -487,16 +481,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")),
   A("stormfly-03.oob", STORMFLY03_OOB),
 
-  // Chef server
+  // Management server
 
-  A("sarel", SAREL_IPV4),
-  A("chef", SAREL_IPV4),
-  A("hardware", SAREL_IPV4),
-  A("acme", SAREL_IPV4),
-  A("git", SAREL_IPV4, TTL("10m")),
-  A("dns", SAREL_IPV4, TTL("10m")),
-  A("sarel.ucl", SAREL_INTERNAL),
-  A("sarel.oob", SAREL_OOB),
+  A("idris", IDRIS_IPV4),
+  AAAA("idris", IDRIS_IPV6),
+  A("acme", IDRIS_IPV4),
+  AAAA("acme", IDRIS_IPV6),
+  A("chef", IDRIS_IPV4),
+  AAAA("chef", IDRIS_IPV6),
+  A("dns", IDRIS_IPV4),
+  AAAA("dns", IDRIS_IPV6),
+  A("git", IDRIS_IPV4),
+  AAAA("git", IDRIS_IPV6),
+  A("hardware", IDRIS_IPV4),
+  AAAA("hardware", IDRIS_IPV6),
+  A("idris.dub", IDRIS_INTERNAL),
+  A("idris.oob", IDRIS_OOB),
 
   // Forum server
 
@@ -663,20 +663,26 @@ 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("errol", ERROL_IPV4),
+  A("errol.ucl", ERROL_INTERNAL),
+  A("errol.oob", ERROL_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("sarel", SAREL_IPV4),
+  A("sarel.ucl", SAREL_INTERNAL),
+  A("sarel.oob", SAREL_OOB),
+
   // Discourse server ("community")
+
   A("jakelong", JAKELONG_IPV4),
   AAAA("jakelong", JAKELONG_IPV6),
   A("community", JAKELONG_IPV4),