Remove falkor from DNS

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index f5c0c190429cbe6f6414381ca3e2e4f1e263d591..b731981ea735ec41ccc2c7651d794218ad337ae2 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -1,9 +1,11 @@
 D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
-  // Publish CAA records indicating that only letsencrypt should issue certificates
+  // Publish CAA records indicating that only letsencrypt and globalsign (Fastly) should issue certificates
 
   CAA("@", "issue", "letsencrypt.org", CF_TTL_ANY),
   CAA("@", "issuewild", "letsencrypt.org", CF_TTL_ANY),
+  CAA("@", "issue", "globalsign.com", CF_TTL_ANY),
+  CAA("@", "issuewild", "globalsign.com", CF_TTL_ANY),
   CAA("@", "iodef", "mailto:hostmaster@openstreetmap.org"),
 
   // Use shenron as the MX host
@@ -22,7 +24,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish DKIM public key
 
-  TXT("20200301._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzvoNZVOGfw1V4A171hxHMhzVTAnIUQVJ8iX3wbqCld8A5iIaXeTGYvBmewymax/cYJS4QqzbpUzkgrrTA9avuZhd+QGJDgjADgx4VyMOaOS6FwAxS0uXtLrt+lsixRDx/feKyZHaxjzJAQy46ok77xXL4UXIaaovw6G6eZpIScMzZQ2zkKNJxTICzzSOduIilHhMWte4XP+/2PdRmD7Ge9jb0U4bZjswX0AqKSGzDKYw+yxVna9l53adeCnklqg2ofoXu+ResiH+kt05aCUOMo8en3em6yBnRCMalgi1E3Tt7I5BWcYFRkT/8agUGW4gGC6XMV9IskOsYL0emG0kGwIDAQAB"),
+  TXT("20200301._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzvoNZVOGfw1V4A171hxHMhzVTAnIUQVJ8iX3wbqCld8A5iIaXeTGYvBmewymax/cYJS4QqzbpUzkgrrTA9avuZhd+QGJDgjADgx4VyMOaOS6FwAxS0uXtLrt+lsixRDx/feKyZHaxjzJAQy46ok77xXL4UXIaaovw6G6eZpIScMzZQ2zkKNJxTICzzSOduIilHhMWte4XP+/2PdRmD7Ge9jb0U4bZjswX0AqKSGzDKYw+yxVna9l53adeCnklqg2ofoXu+ResiH+kt05aCUOMo8en3em6yBnRCMalgi1E3Tt7I5BWcYFRkT/8agUGW4gGC6XMV9IskOsYL0emG0kGwIDAQAB", AUTOSPLIT),
 
   // Announce MTA-STS policy and TLSRPT policy for error reports
 
@@ -31,7 +33,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   
   // Fastly cert domain ownership confirmation
 
-  TXT("_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"),
+  TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"),
+  TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"),
 
   // Delegate MTA-STS policy for subdomains
 
@@ -48,7 +51,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   NS("geo", QUALIFY("balerion")),
   NS("geo", QUALIFY("chrysophylax")),
-  NS("geo", QUALIFY("katie")),
   NS("geo", QUALIFY("saphira")),
   NS("geo", QUALIFY("stormfly-04")),
   NS("geo", QUALIFY("ridgeback")),
@@ -202,11 +204,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("albi", ALBI_IPV4),
   AAAA("albi", ALBI_IPV6),
 
-  CNAME("tile", "tile.geo.openstreetmap.org."),
-  CNAME("a.tile", "tile.geo.openstreetmap.org."),
-  CNAME("b.tile", "tile.geo.openstreetmap.org."),
-  CNAME("c.tile", "tile.geo.openstreetmap.org."),
+  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")),
+  
   // Services machine
 
   A("ironbelly", IRONBELLY_IPV4),
@@ -313,6 +318,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("urmel.ucl", URMEL_INTERNAL),
   A("urmel.oob", URMEL_OOB),
 
+  // Prometheus server
+
+  A("prometheus", TIAMAT11_IPV4),
+
   // Chef server
 
   A("sarel", SAREL_IPV4),
@@ -398,15 +407,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("trogdor.oob", TROGDOR_OOB),
   A("ridgeback", RIDGEBACK_IPV4),
   A("ridgeback.oob", RIDGEBACK_OOB),
-  A("jakelong", JAKELONG_IPV4),
-  AAAA("jakelong", JAKELONG_IPV6),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
-  A("simurgh", SIMURGH_IPV4),
-  A("katie", KATIE_IPV4),
-  AAAA("katie", KATIE_IPV6),
-  A("konqi", KONQI_IPV4),
-  AAAA("konqi", KONQI_IPV6),
   A("longma", LONGMA_IPV4),
   AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),
@@ -427,8 +429,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("stormfly-04", STORMFLY04_IPV4),
   AAAA("stormfly-04", STORMFLY04_IPV6),
   A("stormfly-04.oob", STORMFLY04_OOB),
-  A("rimfaxe", RIMFAXE_IPV4),
-  AAAA("rimfaxe", RIMFAXE_IPV6),
   A("culebre", CULEBRE_IPV4),
   A("kalessin", KALESSIN_IPV4),
   AAAA("kalessin", KALESSIN_IPV6),
@@ -444,14 +444,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("norbert", NORBERT_IPV6),
   A("chrysophylax", CHRYSOPHYLAX_IPV4),
   AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
-  A("necrosan", NECROSAN_IPV4),
-  AAAA("necrosan", NECROSAN_IPV6),
   A("keizer", KEIZER_IPV4),
   AAAA("keizer", KEIZER_IPV6),
   A("vipertooth", VIPERTOOTH_IPV4),
   AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("tuatara", TUATARA_IPV4),
-  AAAA("tuatara", TUATARA_IPV6),
   A("waima", WAIMA_IPV4),
   A("nidhogg", NIDHOGG_IPV4),
   AAAA("nidhogg", NIDHOGG_IPV6),
@@ -465,28 +461,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("naga", NAGA_IPV6),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
-  A("glaedr", GLAEDR_IPV4),
-  AAAA("glaedr", GLAEDR_IPV6),
   A("neak", NEAK_IPV4),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
-  A("fuchur", FUCHUR_IPV4),
-  AAAA("fuchur", FUCHUR_IPV6),
-  A("idris", IDRIS_IPV4),
-  AAAA("idris", IDRIS_IPV6),
-  A("gackelchen", GACKELCHEN_IPV4),
-  AAAA("gackelchen", GACKELCHEN_IPV6),
   A("kokosnuss", KOKOSNUSS_IPV4),
   A("shruikan", SHRUIKAN_IPV4),
   AAAA("shruikan", SHRUIKAN_IPV6),
-  A("falkor", FALKOR_IPV4),
-  AAAA("falkor", FALKOR_IPV6),
-  A("kilgharrah", KILGHARRAH_IPV4),
-  AAAA("kilgharrah", KILGHARRAH_IPV6),
-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
+  A("firnen", FIRNEN_IPV4),
 
   // Blades