]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
projects / dns.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use default TTL for TXT records
[dns.git] / src / openstreetmap.js
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index ae51eb06490c7866e30e8f63cf268f80050eb98f..a9ffcef34d987a2b97861b7bfe3cad8f919cfb1d 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -30,7 +30,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "@",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
@@ -42,7 +41,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "messages",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
@@ -54,7 +52,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "noreply",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
@@ -66,7 +63,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "otrs",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
@@ -78,7 +74,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "community",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "ip4:212.110.172.32",       // shenron ipv4
@@ -124,57 +119,50 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."),
   CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."),
 
-  // Delegate geo.openstreetmap.org to PowerDNS
-
-  NS("geo", QUALIFY("balerion")),
-  NS("geo", QUALIFY("saphira")),
-  NS("geo", QUALIFY("stormfly-04")),
-  NS("geo", QUALIFY("ridgeback")),
-
   // 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("@", 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("@", 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("@", 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),
 
@@ -210,46 +198,46 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   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, 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("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, 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("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, 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),
 
@@ -341,13 +329,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 
-  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")),
+  CNAME("tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  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),
+  AAAA("render", CULEBRE_IPV6),
+  AAAA("render", NIDHOGG_IPV6),
+
   // Services machine
 
   A("ironbelly", IRONBELLY_IPV4),
@@ -441,9 +434,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),
@@ -543,18 +537,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("mta-sts", SHENRON_IPV6),
   A("lists", SHENRON_IPV4),
   AAAA("lists", SHENRON_IPV6),
-  A("svn", SHENRON_IPV4),
-  AAAA("svn", SHENRON_IPV6),
-  A("trac", SHENRON_IPV4),
-  AAAA("trac", SHENRON_IPV6),
-  A("irc", SHENRON_IPV4),
-  AAAA("irc", SHENRON_IPV6),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
-  A("blogs", SHENRON_IPV4, TTL("10m")),
-  AAAA("blogs", SHENRON_IPV6, TTL("10m")),
   A("shenron.bm", SHENRON_INTERNAL),
 
+  // Lockheed service
+
+  A("lockheed", LOCKHEED_IPV4),
+  AAAA("lockheed", LOCKHEED_IPV6),
+  A("svn", LOCKHEED_IPV4),
+  AAAA("svn", LOCKHEED_IPV6),
+  A("trac", LOCKHEED_IPV4),
+  AAAA("trac", LOCKHEED_IPV6),
+  A("irc", LOCKHEED_IPV4),
+  AAAA("irc", LOCKHEED_IPV6),
+  A("blogs", LOCKHEED_IPV4),
+  AAAA("blogs", LOCKHEED_IPV6),
+  A("lockheed.ams", LOCKHEED_INTERNAL),
+  A("lockheed.oob", LOCKHEED_OOB),
+
   // Wiki servers
 
   A("tabaluga", TABALUGA_IPV4),
@@ -670,10 +671,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("naga", NAGA_IPV6),
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
-  A("lockheed.ams", LOCKHEED_INTERNAL),
-  A("lockheed.oob", LOCKHEED_OOB),
 
   // Discourse server ("community")
   A("jakelong", JAKELONG_IPV4),
OpenStreetMap DNS