Revert "Switch IPv4 reverse to use RFC2317 style delegation"

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index f47841d48c7251f44dbb08f7cae41eef8a709586..82b15b560ab4eb35d431b37f59470408169f5af5 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -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"
     ]
@@ -233,16 +238,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   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, 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("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
@@ -256,14 +261,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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 +335,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),
@@ -428,6 +423,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("errol.ucl", ERROL_INTERNAL),
   A("errol.oob", ERROL_OOB),
 
+  A("faffy", FAFFY_IPV4),
+  AAAA("faffy", FAFFY_IPV6),
+  A("faffy.ams", FAFFY_INTERNAL),
+  A("faffy.oob", FAFFY_OOB),
+
   // Foundation server
 
   A("ridley", RIDLEY_IPV4),
@@ -439,9 +439,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),