D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
- // Publish CAA records indicating that only letsencrypt should issue certificates
-
- CAA("@", "issue", "letsencrypt.org", CF_TTL_ANY),
- CAA("@", "issuewild", "letsencrypt.org", CF_TTL_ANY),
- CAA("@", "iodef", "mailto:hostmaster@openstreetmap.org"),
+ // Publish CAA records indicating that only letsencrypt and globalsign (Fastly) should issue certificates
+
+ 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
// 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"),
+ 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"
+ ],
+ ruf: [
+ "mailto:admins@openstreetmap.org"
+ ],
+ 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"),
+ TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"),
// Delegate MTA-STS policy for subdomains
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")),
// 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),
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
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),
A("bowser", BOWSER_IPV4),
+ A("balerion", BALERION_IPV4),
+
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("urmel.ucl", URMEL_INTERNAL),
A("urmel.oob", URMEL_OOB),
+ // Prometheus server
+
+ 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
A("sarel", SAREL_IPV4),
A("clifford.ucl", CLIFFORD_INTERNAL),
A("clifford.oob", CLIFFORD_OOB),
+ // Discourse server
+
+ A("lockheed", LOCKHEED_IPV4),
+ AAAA("lockheed", LOCKHEED_IPV6),
+ A("lockheed.ams", LOCKHEED_INTERNAL),
+ A("lockheed.oob", LOCKHEED_OOB),
+
// KVMs
A("kvm1.ucl", KVM1_INTERNAL),
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),
AAAA("toothless", TOOTHLESS_IPV6),
A("sarkany", SARKANY_IPV4),
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("rimfaxe", RIMFAXE_IPV4),
- AAAA("rimfaxe", RIMFAXE_IPV6),
- A("culebre", CULEBRE_IPV4),
A("kalessin", KALESSIN_IPV4),
AAAA("kalessin", KALESSIN_IPV6),
A("angor", ANGOR_IPV4),
A("ladon", LADON_IPV4),
AAAA("ladon", LADON_IPV6),
A("ascalon", ASCALON_IPV4),
- A("noomoahk", NOOMOAHK_IPV4),
- AAAA("noomoahk", NOOMOAHK_IPV6),
A("cherufe", CHERUFE_IPV4),
- A("norbert", NORBERT_IPV4),
- 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),
A("boitata", BOITATA_IPV4),
AAAA("boitata", BOITATA_IPV6),
- A("fafnir", FAFNIR_IPV4),
- AAAA("fafnir", FAFNIR_IPV6),
A("fume", FUME_IPV4),
- A("balerion", BALERION_IPV4),
- A("naga", NAGA_IPV4),
- 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("firnen", FIRNEN_IPV4),
// Blades
// 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
- 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/
projects / dns.git / blobdiff