Add fume and grisu to DNS

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index ac420a4aa031167718cba02a5aa4da433775cce4..34fe18fb26a04dd96cdb24dd57163f429b35464d 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -23,6 +23,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),
   MX("community", 10, QUALIFY("a.mx")),
+  MX("supporting", 10, QUALIFY("a.mx")),
+
   A("a.mx", FAFNIR_IPV4),
   AAAA("a.mx", FAFNIR_IPV6),
   A("mail", FAFNIR_IPV4),
@@ -122,6 +124,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     ]
   }),
 
+  SPF_BUILDER({
+    label: "supporting",
+    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
+      "ip4:193.60.236.0/24",          // ucl external
+      "ip4:184.104.179.128/27",       // amsterdam external
+      "ip6:2001:470:1:fa1::/64",      // amsterdam external
+      "ip4:184.104.226.96/27",        // dublin external
+      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "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),
@@ -152,6 +172,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("_mta-sts.noreply", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.otrs", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.community", QUALIFY("_mta-sts")),
+  CNAME("_mta-sts.supporting", QUALIFY("_mta-sts")),
 
   // Google postmaster tools verification
 
@@ -277,10 +298,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Taginfo server
 
-  A("grindtooth", GRINDTOOTH_IPV4),
-  A("taginfo", GRINDTOOTH_IPV4),
-  A("grindtooth.ucl", GRINDTOOTH_INTERNAL),
-  A("grindtooth.oob", GRINDTOOTH_OOB),
+  A("dribble", DRIBBLE_IPV4),
+  A("taginfo", DRIBBLE_IPV4),
+  AAAA("dribble", DRIBBLE_IPV6),
+  AAAA("taginfo", DRIBBLE_IPV6),
+  A("dribble.ams", DRIBBLE_INTERNAL),
+  A("dribble.oob", DRIBBLE_OOB),
 
   // Tile servers
 
@@ -313,6 +336,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("pyrene", PYRENE_IPV6),
   A("pyrene.oob", PYRENE_OOB),
 
+  A("piasa", PIASA_IPV4),
+  AAAA("piasa", PIASA_IPV6),
+  A("piasa.oob", PIASA_OOB),
+
   A("bowser", BOWSER_IPV4),
 
   A("balerion", BALERION_IPV4),
@@ -411,7 +438,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("otrs", RIDLEY_IPV4),
   A("blog", RIDLEY_IPV4),
   A("foundation", RIDLEY_IPV4),
-  A("dmca", RIDLEY_IPV4),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
@@ -532,6 +558,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("operations", NAGA_IPV6),
   A("hot", NAGA_IPV4),
   AAAA("hot", NAGA_IPV6),
+  A("dmca", NAGA_IPV4),
+  AAAA("dmca", NAGA_IPV6),
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
 
@@ -598,13 +626,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("meraxes", MERAXES_IPV6),
   A("firnen", FIRNEN_IPV4),
 
-  // Spare
-
-  A("dribble", DRIBBLE_IPV4),
-  AAAA("dribble", DRIBBLE_IPV6),
-  A("dribble.ams", DRIBBLE_INTERNAL),
-  A("dribble.oob", DRIBBLE_OOB),
-
   // Discourse server ("community")
 
   A("jakelong", JAKELONG_IPV4),
@@ -622,9 +643,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("jakelong.dub", JAKELONG_INTERNAL),
   A("jakelong.oob", JAKELONG_OOB),
 
-  // Donation site
+  // Donation site and new OSMF crm site
 
   A("donate", RIDLEY_IPV4),
+  A("support", RIDLEY_IPV4),
+  A("supporting", RIDLEY_IPV4),
+
+  // Spare servers
+
+  A("fume", FUME_IPV4),
+  AAAA("fume", FUME_IPV6),
+  A("fume.dub", FUME_INTERNAL),
+  A("fume.oob", FUME_OOB),
+
+  A("grisu", GRISU_IPV4),
+  AAAA("grisu", GRISU_IPV6),
+  A("grisu.dub", GRISU_INTERNAL),
+  A("grisu.oob", GRISU_OOB),
 
   // Uptime site at StatusCake