Move PL to Fastly

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 83ea852d198e9e94ee5b360d0e3c2a8e154af381..c6dc8193458837444a3e687fc13ac99cab384aeb 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -1,9 +1,11 @@
 D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
 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", "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
   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
 
 
   // 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
 
 
   // Announce MTA-STS policy and TLSRPT policy for error reports
 


@@ -31,7 +33,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   
   // Fastly cert domain ownership confirmation
 
   
   // 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
 
 
   // Delegate MTA-STS policy for subdomains
 


@@ -172,12 +175,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("grindtooth.ucl", GRINDTOOTH_INTERNAL),
   A("grindtooth.oob", GRINDTOOTH_OOB),
 
   A("grindtooth.ucl", GRINDTOOTH_INTERNAL),
   A("grindtooth.oob", GRINDTOOTH_OOB),
 

-  A("stormfly-01", STORMFLY01_IPV4),
-  AAAA("stormfly-01", STORMFLY01_IPV6),
-  // A("taginfo", STORMFLY01_IPV4, TTL("10m")),
-  // AAAA("taginfo", STORMFLY01_IPV6, TTL("10m")),
-  A("stormfly-01.oob", STORMFLY01_OOB),
-

   // Tile servers
 
   A("orm", ORM_IPV4),
   // Tile servers
 
   A("orm", ORM_IPV4),


@@ -212,6 +209,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("a.tile", "tile.geo.openstreetmap.org."),
   CNAME("b.tile", "tile.geo.openstreetmap.org."),
   CNAME("c.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."),

+  
+  // Fastly tile CDN testing
+  
+  CNAME("cdn-fastly-test.tile", "dualstack.osff2.map.fastly.net."),

 
   // Services machine
 
 
   // Services machine
 


@@ -319,6 +320,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("urmel.ucl", URMEL_INTERNAL),
   A("urmel.oob", URMEL_OOB),
 
   A("urmel.ucl", URMEL_INTERNAL),
   A("urmel.oob", URMEL_OOB),
 

+  // Prometheus server
+
+  A("prometheus", TIAMAT11_IPV4),
+

   // Chef server
 
   A("sarel", SAREL_IPV4),
   // Chef server
 
   A("sarel", SAREL_IPV4),


@@ -408,11 +413,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("jakelong", JAKELONG_IPV6),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
   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("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),
   A("longma", LONGMA_IPV4),
   AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),


@@ -427,9 +429,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("sarkany", SARKANY_IPV6),
   A("cmok", CMOK_IPV4),
   AAAA("cmok", CMOK_IPV6),
   AAAA("sarkany", SARKANY_IPV6),
   A("cmok", CMOK_IPV4),
   AAAA("cmok", CMOK_IPV6),

-  A("stormfly-02", STORMFLY02_IPV4),
-  AAAA("stormfly-02", STORMFLY02_IPV6),
-  A("stormfly-02.oob", STORMFLY02_OOB),
+  A("stormfly-03", STORMFLY03_IPV4),
+  AAAA("stormfly-03", STORMFLY03_IPV6),
+  A("stormfly-03.oob", STORMFLY03_OOB),
+  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("rimfaxe", RIMFAXE_IPV4),
   AAAA("rimfaxe", RIMFAXE_IPV6),
   A("culebre", CULEBRE_IPV4),


@@ -447,8 +452,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("norbert", NORBERT_IPV6),
   A("chrysophylax", CHRYSOPHYLAX_IPV4),
   AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
   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),
   A("keizer", KEIZER_IPV4),
   AAAA("keizer", KEIZER_IPV6),
   A("vipertooth", VIPERTOOTH_IPV4),


@@ -490,6 +493,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("kilgharrah", KILGHARRAH_IPV6),
   A("lockheed", LOCKHEED_IPV4),
   AAAA("lockheed", LOCKHEED_IPV6),
   AAAA("kilgharrah", KILGHARRAH_IPV6),
   A("lockheed", LOCKHEED_IPV4),
   AAAA("lockheed", LOCKHEED_IPV6),

+  A("lambton", LAMBTON_IPV4),
+  AAAA("lambton", LAMBTON_IPV6),
+  A("firnen", FIRNEN_IPV4),

 
   // Blades
 
 
   // Blades
 


@@ -532,13 +538,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Spare
 
 
   // Spare
 

-  A("stormfly-03", STORMFLY03_IPV4),
-  AAAA("stormfly-03", STORMFLY03_IPV6),
-  A("stormfly-03.oob", STORMFLY03_OOB),
-
-  A("stormfly-04", STORMFLY04_IPV4),
-  AAAA("stormfly-04", STORMFLY04_IPV6),
-  A("stormfly-04.oob", STORMFLY04_OOB),

 
   // Donation site
 
 
   // Donation site