X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/0478074395c4f9e3526ed49506729e0696c74796..91f3e2f9e3eda8b5621441a873c7a695b31aabd7:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 6487d5f..3118939 100644 --- 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("community", 10, QUALIFY("a.mx")), 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), @@ -104,22 +117,60 @@ 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.community", QUALIFY("_mta-sts")), // 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), + 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", SPIKE02_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")), @@ -224,12 +275,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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."), + CNAME("qa-tile.nominatim", "longma.openstreetmap.org."), // Taginfo server @@ -240,11 +297,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 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), @@ -254,6 +306,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("ysera.ucl", YSERA_INTERNAL), A("ysera.oob", YSERA_OOB), + A("culebre", CULEBRE_IPV4), + AAAA("culebre", CULEBRE_IPV6), + 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), @@ -273,10 +334,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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")), + 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 @@ -291,6 +359,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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.dub", FAFNIR_INTERNAL), + 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")), @@ -308,6 +403,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), @@ -317,9 +415,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -410,28 +505,31 @@ 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.ams", OOB1AMS_INTERNAL), + + A("oob1.dub", OOB1DUB_INTERNAL), // Bytemark machine, and the services which operate from it @@ -443,18 +541,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("mta-sts", SHENRON_IPV6), A("lists", SHENRON_IPV4), AAAA("lists", SHENRON_IPV6), - A("svn", SHENRON_IPV4), - AAAA("svn", SHENRON_IPV6), - A("trac", SHENRON_IPV4), - AAAA("trac", SHENRON_IPV6), - A("irc", SHENRON_IPV4), - AAAA("irc", SHENRON_IPV6), A("help", SHENRON_IPV4), AAAA("help", SHENRON_IPV6), A("blogs", SHENRON_IPV4, TTL("10m")), AAAA("blogs", SHENRON_IPV6, TTL("10m")), A("shenron.bm", SHENRON_INTERNAL), + // Lockheed service + + A("lockheed", LOCKHEED_IPV4), + AAAA("lockheed", LOCKHEED_IPV6), + A("svn", LOCKHEED_IPV4), + AAAA("svn", LOCKHEED_IPV6), + A("trac", LOCKHEED_IPV4), + AAAA("trac", LOCKHEED_IPV6), + A("irc", LOCKHEED_IPV4), + AAAA("irc", LOCKHEED_IPV6), + A("lockheed.ams", LOCKHEED_INTERNAL), + A("lockheed.oob", LOCKHEED_OOB), + // Wiki servers A("tabaluga", TABALUGA_IPV4), @@ -464,6 +569,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -488,8 +602,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), @@ -503,11 +615,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -556,6 +663,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Spare + A("idris", IDRIS_IPV4), + AAAA("idris", IDRIS_IPV6), + A("idris.dub", IDRIS_INTERNAL), + A("idris.oob", IDRIS_OOB), + A("konqi", KONQI_IPV4), + AAAA("konqi", KONQI_IPV6), + A("konqi.dub", KONQI_INTERNAL), + A("konqi.oob", KONQI_OOB), + A("naga", NAGA_IPV4), + AAAA("naga", NAGA_IPV6), + A("naga.dub", NAGA_INTERNAL), + A("naga.oob", NAGA_OOB), + + // Discourse server ("community") + 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), // Donation site