Fix syntax error

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index ed0e785fba6c3736ec0e27e7fb535c35d76dc1e1..c5b10ce8e76406e19c8bf55829938ceb241144a8 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -22,6 +22,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("messages", 10, QUALIFY("a.mx")),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),
   MX("messages", 10, QUALIFY("a.mx")),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),

+  MX("community", 10, QUALIFY("a.mx")),

   A("a.mx", SHENRON_IPV4),
   AAAA("a.mx", SHENRON_IPV6),
 
   A("a.mx", SHENRON_IPV4),
   AAAA("a.mx", SHENRON_IPV6),
 


@@ -75,6 +76,18 @@ 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
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+

   // Publish DKIM public key
 
   TXT("20200301._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzvoNZVOGfw1V4A171hxHMhzVTAnIUQVJ8iX3wbqCld8A5iIaXeTGYvBmewymax/cYJS4QqzbpUzkgrrTA9avuZhd+QGJDgjADgx4VyMOaOS6FwAxS0uXtLrt+lsixRDx/feKyZHaxjzJAQy46ok77xXL4UXIaaovw6G6eZpIScMzZQ2zkKNJxTICzzSOduIilHhMWte4XP+/2PdRmD7Ge9jb0U4bZjswX0AqKSGzDKYw+yxVna9l53adeCnklqg2ofoXu+ResiH+kt05aCUOMo8en3em6yBnRCMalgi1E3Tt7I5BWcYFRkT/8agUGW4gGC6XMV9IskOsYL0emG0kGwIDAQAB", AUTOSPLIT),
   // Publish DKIM public key
 
   TXT("20200301._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzvoNZVOGfw1V4A171hxHMhzVTAnIUQVJ8iX3wbqCld8A5iIaXeTGYvBmewymax/cYJS4QqzbpUzkgrrTA9avuZhd+QGJDgjADgx4VyMOaOS6FwAxS0uXtLrt+lsixRDx/feKyZHaxjzJAQy46ok77xXL4UXIaaovw6G6eZpIScMzZQ2zkKNJxTICzzSOduIilHhMWte4XP+/2PdRmD7Ge9jb0U4bZjswX0AqKSGzDKYw+yxVna9l53adeCnklqg2ofoXu+ResiH+kt05aCUOMo8en3em6yBnRCMalgi1E3Tt7I5BWcYFRkT/8agUGW4gGC6XMV9IskOsYL0emG0kGwIDAQAB", AUTOSPLIT),


@@ -104,20 +117,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("_mta-sts.messages", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.noreply", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.otrs", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.messages", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.noreply", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.otrs", QUALIFY("_mta-sts")),

+  CNAME("_mta-sts.community", QUALIFY("_mta-sts")),

 
   // Google postmaster tools verification
 
   CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."),
   CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."),
 
 
   // Google postmaster tools verification
 
   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("chrysophylax")),
-  NS("geo", QUALIFY("saphira")),
-  NS("geo", QUALIFY("stormfly-04")),
-  NS("geo", QUALIFY("ridgeback")),
-

   // Main web servers and their aliases
 
   A("spike-01", SPIKE01_IPV4),
   // Main web servers and their aliases
 
   A("spike-01", SPIKE01_IPV4),


@@ -269,12 +275,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dulcy.ams", DULCY_INTERNAL),
   A("dulcy.oob", DULCY_OOB),
 
   A("dulcy.ams", DULCY_INTERNAL),
   A("dulcy.oob", DULCY_OOB),
 

+  A("longma", LONGMA_IPV4),
+  AAAA("longma", LONGMA_IPV6),
+  A("longma.dub", LONGMA_INTERNAL),
+  A("longma.oob", LONGMA_OOB),
+

   A("stormfly-04", STORMFLY04_IPV4),
   AAAA("stormfly-04", STORMFLY04_IPV6),
   A("stormfly-04.oob", STORMFLY04_OOB),
 
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
   A("stormfly-04", STORMFLY04_IPV4),
   AAAA("stormfly-04", STORMFLY04_IPV6),
   A("stormfly-04.oob", STORMFLY04_OOB),
 
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),

+  CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),

 
   // Taginfo server
 
 
   // Taginfo server
 


@@ -285,11 +297,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Tile servers
 
 
   // Tile servers
 

-  A("orm", ORM_IPV4),
-  AAAA("orm", ORM_IPV6),
-  A("orm.ams", ORM_INTERNAL),
-  A("orm.oob", ORM_OOB),
-

   A("odin", ODIN_IPV4),
   AAAA("odin", ODIN_IPV6),
   A("odin.ams", ODIN_INTERNAL),
   A("odin", ODIN_IPV4),
   AAAA("odin", ODIN_IPV6),
   A("odin.ams", ODIN_INTERNAL),


@@ -304,6 +311,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("culebre.dub", CULEBRE_INTERNAL),
   A("culebre.oob", CULEBRE_OOB),
 
   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),
 
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 


@@ -323,10 +334,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 
   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
 
 
   // Services machine
 


@@ -341,15 +359,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
   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", 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.bm", FAFNIR_INTERNAL),
+  A("fafnir.dub", FAFNIR_INTERNAL),

   A("fafnir.oob", FAFNIR_OOB),
 
   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")),
   A("grisu", GRISU_IPV4),
   AAAA("grisu", GRISU_IPV6),
   // A("backup", GRISU_IPV4, TTL("10m")),


@@ -379,9 +415,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("katla.bm", KATLA_INTERNAL),
   A("katla.oob", KATLA_OOB),
 
   A("katla.bm", KATLA_INTERNAL),
   A("katla.oob", KATLA_OOB),
 

-  A("ramoth.ams", RAMOTH_INTERNAL),
-  A("ramoth.oob", RAMOTH_OOB),
-

   // Development server with wildcard alias for user sites
 
   A("errol", ERROL_IPV4),
   // Development server with wildcard alias for user sites
 
   A("errol", ERROL_IPV4),


@@ -472,15 +505,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("clifford.ucl", CLIFFORD_INTERNAL),
   A("clifford.oob", CLIFFORD_OOB),
 
   A("clifford.ucl", CLIFFORD_INTERNAL),
   A("clifford.oob", CLIFFORD_OOB),
 

-  // 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),
-

   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),
   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),


@@ -503,6 +527,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Out of band access servers
 
 
   // Out of band access servers
 

+  A("oob1.ams", OOB1AMS_INTERNAL),
+

   A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
   A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it


@@ -536,6 +562,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("tabaluga.ams", TABALUGA_INTERNAL),
   A("tabaluga.oob", TABALUGA_OOB),
 
   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),
   // GPS tile server
 
   A("noquiklos", NOQUIKLOS_IPV4),


@@ -573,11 +608,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),

-  A("chrysophylax", CHRYSOPHYLAX_IPV4),
-  AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
-  A("vipertooth", VIPERTOOTH_IPV4),
-  AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("fume", FUME_IPV4),

   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
   A("neak", NEAK_IPV4),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
   A("neak", NEAK_IPV4),


@@ -638,12 +668,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("naga", NAGA_IPV6),
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
   AAAA("naga", NAGA_IPV6),
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),

-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
-  A("gorwen.dub", GORWEN_INTERNAL),
-  A("gorwen.oob", GORWEN_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),
   AAAA("jakelong", JAKELONG_IPV6),
   A("jakelong", JAKELONG_IPV4),
   AAAA("jakelong", JAKELONG_IPV6),

+  A("community", JAKELONG_IPV4),
+  A("communities", JAKELONG_IPV4),
+  AAAA("community", JAKELONG_IPV6),
+  AAAA("communities", JAKELONG_IPV6),

   A("jakelong.dub", JAKELONG_INTERNAL),
   A("jakelong.oob", JAKELONG_OOB),
 
   A("jakelong.dub", JAKELONG_INTERNAL),
   A("jakelong.oob", JAKELONG_OOB),