]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
Add addresses for remaining Dublin machines
[dns.git] / src / openstreetmap.js
index 4f8af96e56268feadd09cb1bd05127a8d5fca3a8..cbf86a88fbeebad6825eb4b3b2f03cf417bdc20e 100644 (file)
@@ -2,11 +2,19 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // 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"),
+  CAA_BUILDER({
+    label: "@",
+    ttl: "1h",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+      "globalsign.com",   // Used by Fastly for CDN certificates
+    ],
+    issuewild: [
+      "letsencrypt.org",
+      "globalsign.com",   // Used by Fastly for CDN certificates
+    ],
+  }),
 
   // Use shenron as the MX host
 
@@ -19,18 +27,73 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish SPF records indicating that only shenron sends mail
 
-  TXT("@", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all"),
-  TXT("otrs", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all"),
+  SPF_BUILDER({
+    label: "@",
+    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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "messages",
+    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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "noreply",
+    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"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "otrs",
+    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 DMARC report-only policy
+
+  DMARC_BUILDER({
+    policy: "none",
+    rua: [
+      "mailto:openstreetmap-d@dmarc.report-uri.com"
+    ],
+    failureOptions: 1
+  }),
+
   // Announce MTA-STS policy and TLSRPT policy for error reports
 
   TXT("_mta-sts", "v=STSv1; id=202001291805Z"),
-  TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:postmaster@openstreetmap.org"),
-  
+  TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:openstreetmap-d@tlsrpt.report-uri.com"),
+
   // Fastly cert domain ownership confirmation
 
   TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"),
@@ -57,6 +120,51 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // 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("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("spike-02.dub", SPIKE02_INTERNAL),
+  A("spike-02.oob", SPIKE04_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("spike-03.dub", SPIKE03_INTERNAL),
+  A("spike-03.oob", SPIKE03_OOB),
+
   A("spike-04", SPIKE04_IPV4),
   AAAA("spike-04", SPIKE04_IPV6),
   // A("@", SPIKE04_IPV4, TTL("10m")),
@@ -134,10 +242,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Rails application servers
 
-  A("thorn-01.ams", THORN01_INTERNAL),
-  A("rails1.ams", THORN01_INTERNAL),
-  A("thorn-01.oob", THORN01_OOB),
-
   A("thorn-02.ams", THORN02_INTERNAL),
   A("rails2.ams", THORN02_INTERNAL),
   A("thorn-02.oob", THORN02_OOB),
@@ -165,7 +269,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dulcy.ams", DULCY_INTERNAL),
   A("dulcy.oob", DULCY_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."),
 
   // Taginfo server
 
@@ -190,6 +299,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ysera.ucl", YSERA_INTERNAL),
   A("ysera.oob", YSERA_OOB),
 
+  A("culebre", CULEBRE_IPV4),
+  A("culebre.dub", CULEBRE_INTERNAL),
+  AAAA("culebre", CULEBRE_IPV6),
+
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 
@@ -213,7 +326,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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),
@@ -227,6 +340,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_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.bm", FAFNIR_INTERNAL),
+  A("fafnir.oob", FAFNIR_OOB),
+
   A("grisu", GRISU_IPV4),
   AAAA("grisu", GRISU_IPV6),
   // A("backup", GRISU_IPV4, TTL("10m")),
@@ -244,6 +366,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("snap-02.ucl", SNAP02_INTERNAL),
   A("snap-02.oob", SNAP02_OOB),
 
+  A("snap-03.dub", SNAP03_INTERNAL),
+  A("snap-03.oob", SNAP03_OOB),
+
   A("karm.ams", KARM_INTERNAL),
   A("karm.oob", KARM_OOB),
 
@@ -322,7 +447,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Prometheus server
 
-  A("prometheus", TIAMAT11_IPV4),
+  A("stormfly-03", STORMFLY03_IPV4),
+  AAAA("stormfly-03", STORMFLY03_IPV6),
+  A("prometheus", STORMFLY03_IPV4, TTL("10m")),
+  AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")),
+  A("stormfly-03.oob", STORMFLY03_OOB),
 
   // Chef server
 
@@ -342,19 +471,38 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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),
 
   // Managed network switches
 
-  A("switch1", SWITCH1_IPV4),
-  AAAA("switch1", SWITCH1_IPV6),
+  A("switch1.ams", SWITCH1AMS_IPV4),
+  AAAA("switch1.ams", SWITCH1AMS_IPV6),
+
+  A("switch1.dub", SWITCH1DUB_IPV4),
+  AAAA("switch1.dub", SWITCH1DUB_IPV6),
 
   // Managed power strips
 
-  A("pdu1.ams", PDU1_INTERNAL),
-  A("pdu2.ams", PDU2_INTERNAL),
+  A("pdu1.ams", PDU1AMS_INTERNAL),
+  A("pdu2.ams", PDU2AMS_INTERNAL),
+
+  A("pdu1.dub", PDU1DUB_INTERNAL),
+  A("pdu2.dub", PDU2DUB_INTERNAL),
+
+  // Out of band access servers
+
+  A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
 
@@ -411,8 +559,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridgeback.oob", RIDGEBACK_OOB),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
-  A("longma", LONGMA_IPV4),
-  AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),
   AAAA("viserion", VISERION_IPV6),
   A("drogon", DROGON_IPV4),
@@ -421,50 +567,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("saphira", SAPHIRA_IPV6),
   A("toothless", TOOTHLESS_IPV4),
   AAAA("toothless", TOOTHLESS_IPV6),
-  A("sarkany", SARKANY_IPV4),
-  AAAA("sarkany", SARKANY_IPV6),
-  A("cmok", CMOK_IPV4),
-  AAAA("cmok", CMOK_IPV6),
-  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("kalessin", KALESSIN_IPV4),
-  AAAA("kalessin", KALESSIN_IPV6),
   A("angor", ANGOR_IPV4),
   // AAAA("angor", ANGOR_IPV6),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),
-  A("cherufe", CHERUFE_IPV4),
-  A("norbert", NORBERT_IPV4),
-  AAAA("norbert", NORBERT_IPV6),
   A("chrysophylax", CHRYSOPHYLAX_IPV4),
   AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
-  A("keizer", KEIZER_IPV4),
-  AAAA("keizer", KEIZER_IPV6),
   A("vipertooth", VIPERTOOTH_IPV4),
   AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("waima", WAIMA_IPV4),
-  A("nidhogg", NIDHOGG_IPV4),
-  AAAA("nidhogg", NIDHOGG_IPV6),
-  A("boitata", BOITATA_IPV4),
-  AAAA("boitata", BOITATA_IPV6),
-  A("fafnir", FAFNIR_IPV4),
-  AAAA("fafnir", FAFNIR_IPV6),
   A("fume", FUME_IPV4),
-  A("naga", NAGA_IPV4),
-  AAAA("naga", NAGA_IPV6),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
   A("neak", NEAK_IPV4),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
-  A("kokosnuss", KOKOSNUSS_IPV4),
-  A("shruikan", SHRUIKAN_IPV4),
-  AAAA("shruikan", SHRUIKAN_IPV6),
   A("firnen", FIRNEN_IPV4),
 
   // Blades
@@ -508,14 +625,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Spare
 
+  A("idris", IDRIS_IPV4),
+  AAAA("idris", IDRIS_IPV6),
+  A("konqi", KONQI_IPV4),
+  AAAA("konqi", KONQI_IPV6),
+  A("naga", NAGA_IPV4),
+  AAAA("naga", NAGA_IPV6),
 
   // Donation site
 
-  A("donate", RIDLEY_IPV4, TTL("10m")),
+  A("donate", RIDLEY_IPV4),
 
   // Uptime site at StatusCake
 
-  CNAME("uptime", "uptimessl.statuscake.com."),
+  CNAME("uptime", "uptimessl-new.statuscake.com."),
 
   // Custom Domain for https://github.com/osmfoundation/welcome-mat/