From b5319ac1d430cc31750df68a5cd4690a93159e7a Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 30 Jan 2024 17:56:10 +0000 Subject: [PATCH 01/16] Switch osmfoundation.org to mailbox.org MX --- src/osmfoundation.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 7d83d66..866894f 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -13,13 +13,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ], }), - // Let google handle email + // Let mailbox.org handle email - MX("@", 1, "aspmx.l.google.com."), - MX("@", 5, "alt1.aspmx.l.google.com."), - MX("@", 5, "alt2.aspmx.l.google.com."), - MX("@", 10, "alt3.aspmx.l.google.com."), - MX("@", 10, "alt4.aspmx.l.google.com."), + MX("@", 10, "mxext1.mailbox.org."), + MX("@", 10, "mxext2.mailbox.org."), + MX("@", 20, "mxext3.mailbox.org."), // Handle mail for the join subdomain ourselves @@ -100,6 +98,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("calendar", "ghs.googlehosted.com."), CNAME("sites", "ghs.googlehosted.com."), + // Aliases for mailbox.org services + + CNAME("autoconfig", "mailbox.org."), + SRV("_hkps._tcp", 1, 1, 443, "pgp.mailbox.org."), + // Main web server and it's aliases A("@", RIDLEY_IPV4), -- 2.45.1 From 9e30d38d74e3a6c82030bbd97f57b68617ce3ef2 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 30 Jan 2024 18:03:32 +0000 Subject: [PATCH 02/16] Move osmf spf mailbox.org include to first --- src/osmfoundation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 866894f..8c4397c 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -29,6 +29,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), label: "@", parts: [ "v=spf1", + "include:mailbox.org", // mailbox.org "include:_spf.google.com", // Google GSuite "ip4:212.110.172.32", // shenron ipv4 "ip6:2001:41c9:1:400::32", // shenron ipv6 @@ -39,7 +40,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "ip6:2001:470:1:fa1::/64", // amsterdam external "ip4:184.104.226.96/27", // dublin external "ip6:2001:470:1:b3b::/64", // dublin external - "include:mailbox.org", // mailbox.org "-all" ] }), -- 2.45.1 From 867bef5f6eafc9319ba6bb4d90124e543a16fac0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonathan=20Beli=C3=ABn?= Date: Wed, 7 Feb 2024 17:46:53 +0100 Subject: [PATCH 03/16] Update stateofthemap-eu.js Add 2023.stateofthemap.eu sub-domain for 2023 SotM EU website so Poland can re-use stateofthemap.eu for this year's edition. --- src/stateofthemap-eu.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 2a21842..a8de02e 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -31,6 +31,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Previous editions - A("2014", "49.12.5.171") + A("2014", "49.12.5.171"), + CNAME("2023", "osmbe.github.io.") ); -- 2.45.1 From 1d25c180a98a9a6132f47c379c73832af024010d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 9 Feb 2024 13:01:21 +0200 Subject: [PATCH 04/16] Add openstreetmap.mg --- dnsconfig.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dnsconfig.js b/dnsconfig.js index d743785..c566da3 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -68,6 +68,7 @@ OPENSTREETMAP("openstreetmap.am", REG_GANDI); OPENSTREETMAP("openstreetmap.fi", REG_GANDI); OPENSTREETMAP("openstreetmap.gr", REG_GANDI); OPENSTREETMAP("openstreetmap.me", REG_GANDI); +OPENSTREETMAP("openstreetmap.mg", REG_GANDI); OPENSTREETMAP("openstreetmap.mx", REG_GANDI); OPENSTREETMAP("openstreetmap.nz", REG_GANDI); OPENSTREETMAP("openstreetmap.pe", REG_GANDI); -- 2.45.1 From a8e6a7bb915f1f4de3b4c8598087b483933fe175 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 9 Feb 2024 13:23:42 +0200 Subject: [PATCH 05/16] Add dummy comment to force rebuild --- dnsconfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnsconfig.js b/dnsconfig.js index c566da3..f2a0e64 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -68,7 +68,7 @@ OPENSTREETMAP("openstreetmap.am", REG_GANDI); OPENSTREETMAP("openstreetmap.fi", REG_GANDI); OPENSTREETMAP("openstreetmap.gr", REG_GANDI); OPENSTREETMAP("openstreetmap.me", REG_GANDI); -OPENSTREETMAP("openstreetmap.mg", REG_GANDI); +OPENSTREETMAP("openstreetmap.mg", REG_GANDI); // State of the Map Madagascar OPENSTREETMAP("openstreetmap.mx", REG_GANDI); OPENSTREETMAP("openstreetmap.nz", REG_GANDI); OPENSTREETMAP("openstreetmap.pe", REG_GANDI); -- 2.45.1 From 2131839e59f0dee01080b1cb3c25f976f8bfd1e3 Mon Sep 17 00:00:00 2001 From: Kamil Monicz Date: Mon, 12 Feb 2024 11:46:55 +0100 Subject: [PATCH 06/16] Reconfigure DNS for the new edition --- src/stateofthemap-eu.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index a8de02e..14776b1 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -13,25 +13,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ], }), - // Let OSMBE handle email (through Fastmail) - // https://www.fastmail.help/hc/en-us/articles/1500000280261 + // Block email delivery - MX("@", 10, "in1-smtp.messagingengine.com."), - MX("@", 20, "in2-smtp.messagingengine.com."), - - TXT("@", "v=spf1 include:spf.messagingengine.com ?all"), - CNAME("fm1._domainkey", "fm1.stateofthemap.eu.dkim.fmhosted.com."), - CNAME("fm2._domainkey", "fm2.stateofthemap.eu.dkim.fmhosted.com."), - CNAME("fm3._domainkey", "fm3.stateofthemap.eu.dkim.fmhosted.com."), + TXT("_dmarc", "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;"), + TXT("*._domainkey", "v=DKIM1; p="), + TXT("@", "v=spf1 -all"), // Site hosted on github pages - ALIAS("@", "osmbe.github.io."), - CNAME("www", "osmbe.github.io."), + ALIAS("@", "openstreetmap-polska.github.io."), + CNAME("www", "openstreetmap-polska.github.io."), // Previous editions A("2014", "49.12.5.171"), - CNAME("2023", "osmbe.github.io.") + CNAME("2023", "osmbe.github.io."), + CNAME("2024", "openstreetmap-polska.github.io.") ); -- 2.45.1 From cd0b0a1271a1097db9fb9a290611c3090d1468cd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 7 Mar 2024 13:24:37 +0000 Subject: [PATCH 07/16] Point overpass at grisu --- src/openstreetmap.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index e3c0918..4e1d6fe 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -575,10 +575,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Overpass server + A("grisu", GRISU_IPV4), + AAAA("grisu", GRISU_IPV6), + A("query", GRISU_IPV4), + AAAA("query", GRISU_IPV6), + A("grisu.dub", GRISU_INTERNAL), + A("grisu.oob", GRISU_OOB), + A("gorwen", GORWEN_IPV4), AAAA("gorwen", GORWEN_IPV6), - A("query", GORWEN_IPV4), - AAAA("query", GORWEN_IPV6), A("gorwen.dub", GORWEN_INTERNAL), A("gorwen.oob", GORWEN_OOB), @@ -648,11 +653,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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 CNAME("uptime", "uptimessl-new.statuscake.com."), -- 2.45.1 From e80b3455187e180528359ecfc31a04f39d468738 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 8 Mar 2024 13:16:57 +0000 Subject: [PATCH 08/16] Setup openstreetmap.mg to point to Github Pages --- dnsconfig.js | 5 ++++- src/openstreetmap-mg.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/openstreetmap-mg.js diff --git a/dnsconfig.js b/dnsconfig.js index f2a0e64..88b4218 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -68,7 +68,6 @@ OPENSTREETMAP("openstreetmap.am", REG_GANDI); OPENSTREETMAP("openstreetmap.fi", REG_GANDI); OPENSTREETMAP("openstreetmap.gr", REG_GANDI); OPENSTREETMAP("openstreetmap.me", REG_GANDI); -OPENSTREETMAP("openstreetmap.mg", REG_GANDI); // State of the Map Madagascar OPENSTREETMAP("openstreetmap.mx", REG_GANDI); OPENSTREETMAP("openstreetmap.nz", REG_GANDI); OPENSTREETMAP("openstreetmap.pe", REG_GANDI); @@ -121,6 +120,10 @@ STATEOFTHEMAP("sotm.org", REG_GANDI); var STATEOFTHEMAP_EU = loadTemplate("stateofthemap-eu"); STATEOFTHEMAP_EU("stateofthemap.eu", REG_NONE); +// State of the Map Madagascar +var OPENSTREETMAP_MG = loadTemplate("openstreetmap-mg"); +OPENSTREETMAP_MG("openstreetmap.mg", REG_GANDI); + var OPENGEODATA = loadTemplate("opengeodata"); OPENGEODATA("opengeodata.org", REG_GANDI); diff --git a/src/openstreetmap-mg.js b/src/openstreetmap-mg.js new file mode 100644 index 0000000..80ae23c --- /dev/null +++ b/src/openstreetmap-mg.js @@ -0,0 +1,29 @@ +D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), + + // Publish CAA records indicating that only letsencrypt should issue certificates + + CAA_BUILDER({ + label: "@", + iodef: "mailto:hostmaster@openstreetmap.org", + issue: [ + "letsencrypt.org", + ], + issuewild: [ + "letsencrypt.org", + ], + }), + + // Block email delivery + + TXT("_dmarc", "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;"), + TXT("*._domainkey", "v=DKIM1; p="), + TXT("@", "v=spf1 -all"), + + // Site hosted on github pages + + ALIAS("@", "openstreetmap-madagascar.github.io."), + CNAME("www", "openstreetmap-madagascar.github.io."), + + CNAME("sotm2024", "openstreetmap-madagascar.github.io.") + +); \ No newline at end of file -- 2.45.1 From a2a89e9a7be9171d8e913f8df5b8c9f0457d1244 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 10 Mar 2024 19:40:18 +0000 Subject: [PATCH 09/16] Remove gorwen --- src/hosts.js | 5 ----- src/openstreetmap.js | 5 ----- src/ptr_equinix_dub_ipv4.js | 1 - src/ptr_equinix_dub_ipv6.js | 1 - 4 files changed, 12 deletions(-) diff --git a/src/hosts.js b/src/hosts.js index c1914b7..5c98d3c 100644 --- a/src/hosts.js +++ b/src/hosts.js @@ -47,11 +47,6 @@ var FUME_IPV6 = "2001:470:1:b3b::10"; var FUME_INTERNAL = "10.0.64.16"; var FUME_OOB = "10.0.65.16"; -var GORWEN_IPV4 = "184.104.226.107"; -var GORWEN_IPV6 = "2001:470:1:b3b::b"; -var GORWEN_INTERNAL = "10.0.64.11"; -var GORWEN_OOB = "10.0.65.11"; - var GRISU_IPV4 = "184.104.226.113"; var GRISU_IPV6 = "2001:470:1:b3b::11"; var GRISU_INTERNAL = "10.0.64.17"; diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 4e1d6fe..f8fd1d0 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -582,11 +582,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("grisu.dub", GRISU_INTERNAL), A("grisu.oob", GRISU_OOB), - A("gorwen", GORWEN_IPV4), - AAAA("gorwen", GORWEN_IPV6), - A("gorwen.dub", GORWEN_INTERNAL), - A("gorwen.oob", GORWEN_OOB), - // GPS tile server A("muirdris", MUIRDRIS_IPV4), diff --git a/src/ptr_equinix_dub_ipv4.js b/src/ptr_equinix_dub_ipv4.js index 60dab4c..66cee26 100644 --- a/src/ptr_equinix_dub_ipv4.js +++ b/src/ptr_equinix_dub_ipv4.js @@ -2,7 +2,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(CULEBRE_IPV4.split(".").pop(), "culebre.openstreetmap.org."), PTR(FAFNIR_IPV4.split(".").pop(), "fafnir.openstreetmap.org."), - PTR(GORWEN_IPV4.split(".").pop(), "gorwen.openstreetmap.org."), PTR(HORNTAIL_IPV4.split(".").pop(), "horntail.openstreetmap.org."), PTR(IDRIS_IPV4.split(".").pop(), "idris.openstreetmap.org."), PTR(JAKELONG_IPV4.split(".").pop(), "jakelong.openstreetmap.org."), diff --git a/src/ptr_equinix_dub_ipv6.js b/src/ptr_equinix_dub_ipv6.js index 4adfd66..2bf34f8 100644 --- a/src/ptr_equinix_dub_ipv6.js +++ b/src/ptr_equinix_dub_ipv6.js @@ -1,7 +1,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(CULEBRE_IPV6, "culebre.openstreetmap.org."), PTR(FAFNIR_IPV6, "fafnir.openstreetmap.org."), - PTR(GORWEN_IPV6, "gorwen.openstreetmap.org."), PTR(HORNTAIL_IPV6, "horntail.openstreetmap.org."), PTR(IDRIS_IPV6, "idris.openstreetmap.org."), PTR(JAKELONG_IPV6, "jakelong.openstreetmap.org."), -- 2.45.1 From f6e7267923c5d88d3a921988e8135f60f250c411 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 13 Mar 2024 14:14:44 +0000 Subject: [PATCH 10/16] Repoint munin to prometheus for redirect --- src/openstreetmap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index f8fd1d0..36c07f7 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -479,12 +479,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("c.os", KESSIE_IPV6, TTL("1h")), A("kessie.oob", KESSIE_OOB), - // Prometheus server + // Prometheus server and munin redirect A("stormfly-03", STORMFLY03_IPV4), AAAA("stormfly-03", STORMFLY03_IPV6), A("prometheus", STORMFLY03_IPV4), AAAA("prometheus", STORMFLY03_IPV6), + A("munin", STORMFLY03_IPV4), + AAAA("munin", STORMFLY03_IPV6), A("stormfly-03.oob", STORMFLY03_OOB), // Management server @@ -551,8 +553,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("irc", NAGA_IPV6), A("blogs", NAGA_IPV4), AAAA("blogs", NAGA_IPV6), - A("munin", NAGA_IPV4), - AAAA("munin", NAGA_IPV6), A("welcome", NAGA_IPV4), AAAA("welcome", NAGA_IPV6), A("operations", NAGA_IPV4), -- 2.45.1 From b13ada4cd17775d88cd20554fd1fea831ec9fb76 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 27 Mar 2024 15:16:20 +0000 Subject: [PATCH 11/16] Move aerial.openstreetmap.org.za to ironbelly --- src/openstreetmap-za.js | 66 ++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js index 38090f0..4fa90fd 100644 --- a/src/openstreetmap-za.js +++ b/src/openstreetmap-za.js @@ -38,40 +38,44 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("www", "www.openstreetmap.org."), CNAME("api", "api.openstreetmap.org."), - // Aerial imagery sites on draco + // Aerial imagery sites on ironbelly - A("aerial", DRACO_IPV4, TTL("10m")), - A("a.aerial", DRACO_IPV4, TTL("10m")), - A("b.aerial", DRACO_IPV4, TTL("10m")), - A("c.aerial", DRACO_IPV4, TTL("10m")), + A("aerial", IRONBELLY_IPV4), + AAAA("aerial", IRONBELLY_IPV6), + A("a.aerial", IRONBELLY_IPV4), + AAAA("a.aerial", IRONBELLY_IPV6), + A("b.aerial", IRONBELLY_IPV4), + AAAA("b.aerial", IRONBELLY_IPV6), + A("c.aerial", IRONBELLY_IPV4), + AAAA("c.aerial", IRONBELLY_IPV6), // Aerial imagery sites on kessie - A("coct.aerial", KESSIE_IPV4, TTL("30m")), - AAAA("coct.aerial", KESSIE_IPV6, TTL("30m")), - A("a.coct.aerial", KESSIE_IPV4, TTL("30m")), - AAAA("a.coct.aerial", KESSIE_IPV6, TTL("30m")), - A("b.coct.aerial", KESSIE_IPV4, TTL("30m")), - AAAA("b.coct.aerial", KESSIE_IPV6, TTL("30m")), - A("c.coct.aerial", KESSIE_IPV4, TTL("30m")), - AAAA("c.coct.aerial", KESSIE_IPV6, TTL("30m")), - - A("topo", KESSIE_IPV4, TTL("30m")), - AAAA("topo", KESSIE_IPV6, TTL("30m")), - A("a.topo", KESSIE_IPV4, TTL("30m")), - AAAA("a.topo", KESSIE_IPV6, TTL("30m")), - A("b.topo", KESSIE_IPV4, TTL("30m")), - AAAA("b.topo", KESSIE_IPV6, TTL("30m")), - A("c.topo", KESSIE_IPV4, TTL("30m")), - AAAA("c.topo", KESSIE_IPV6, TTL("30m")), - - A("namibia-topo", KESSIE_IPV4, TTL("30m")), - AAAA("namibia-topo", KESSIE_IPV6, TTL("30m")), - A("a.namibia-topo", KESSIE_IPV4, TTL("30m")), - AAAA("a.namibia-topo", KESSIE_IPV6, TTL("30m")), - A("b.namibia-topo", KESSIE_IPV4, TTL("30m")), - AAAA("b.namibia-topo", KESSIE_IPV6, TTL("30m")), - A("c.namibia-topo", KESSIE_IPV4, TTL("30m")), - AAAA("c.namibia-topo", KESSIE_IPV6, TTL("30m")) + A("coct.aerial", KESSIE_IPV4), + AAAA("coct.aerial", KESSIE_IPV6), + A("a.coct.aerial", KESSIE_IPV4), + AAAA("a.coct.aerial", KESSIE_IPV6), + A("b.coct.aerial", KESSIE_IPV4), + AAAA("b.coct.aerial", KESSIE_IPV6), + A("c.coct.aerial", KESSIE_IPV4), + AAAA("c.coct.aerial", KESSIE_IPV6), + + A("topo", KESSIE_IPV4), + AAAA("topo", KESSIE_IPV6), + A("a.topo", KESSIE_IPV4), + AAAA("a.topo", KESSIE_IPV6), + A("b.topo", KESSIE_IPV4), + AAAA("b.topo", KESSIE_IPV6), + A("c.topo", KESSIE_IPV4), + AAAA("c.topo", KESSIE_IPV6), + + A("namibia-topo", KESSIE_IPV4), + AAAA("namibia-topo", KESSIE_IPV6), + A("a.namibia-topo", KESSIE_IPV4), + AAAA("a.namibia-topo", KESSIE_IPV6), + A("b.namibia-topo", KESSIE_IPV4), + AAAA("b.namibia-topo", KESSIE_IPV6), + A("c.namibia-topo", KESSIE_IPV4), + AAAA("c.namibia-topo", KESSIE_IPV6) ); -- 2.45.1 From de37728028d8a11f5ffcf7ee443755fc675ded6f Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 28 Mar 2024 12:27:38 +0000 Subject: [PATCH 12/16] remove draco --- src/hosts.js | 4 ---- src/openstreetmap.js | 36 ++++++++++++++++-------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/hosts.js b/src/hosts.js index 5c98d3c..24a2e5b 100644 --- a/src/hosts.js +++ b/src/hosts.js @@ -15,10 +15,6 @@ var CULEBRE_IPV6 = "2001:470:1:b3b::9"; var CULEBRE_INTERNAL = "10.0.64.9"; var CULEBRE_OOB = "10.0.65.9"; -var DRACO_IPV4 = "193.60.236.12"; -var DRACO_INTERNAL = "10.0.0.11"; -var DRACO_OOB = "10.0.1.11"; - var DRIBBLE_IPV4 = "184.104.179.132"; var DRIBBLE_IPV6 = "2001:470:1:fa1::4"; var DRIBBLE_INTERNAL = "10.0.48.4"; diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 36c07f7..d3fece1 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -455,28 +455,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Imagery servers - A("draco", DRACO_IPV4), - A("draco.ucl", DRACO_INTERNAL), - A("draco.oob", DRACO_OOB), - A("kessie", KESSIE_IPV4), AAAA("kessie", KESSIE_IPV6), - A("agri", KESSIE_IPV4, TTL("1h")), - AAAA("agri", KESSIE_IPV6, TTL("1h")), - A("a.agri", KESSIE_IPV4, TTL("1h")), - AAAA("a.agri", KESSIE_IPV6, TTL("1h")), - A("b.agri", KESSIE_IPV4, TTL("1h")), - AAAA("b.agri", KESSIE_IPV6, TTL("1h")), - A("c.agri", KESSIE_IPV4, TTL("1h")), - AAAA("c.agri", KESSIE_IPV6, TTL("1h")), - A("os", KESSIE_IPV4, TTL("1h")), - AAAA("os", KESSIE_IPV6, TTL("1h")), - A("a.os", KESSIE_IPV4, TTL("1h")), - AAAA("a.os", KESSIE_IPV6, TTL("1h")), - A("b.os", KESSIE_IPV4, TTL("1h")), - AAAA("b.os", KESSIE_IPV6, TTL("1h")), - A("c.os", KESSIE_IPV4, TTL("1h")), - AAAA("c.os", KESSIE_IPV6, TTL("1h")), + A("agri", KESSIE_IPV4), + AAAA("agri", KESSIE_IPV6), + A("a.agri", KESSIE_IPV4), + AAAA("a.agri", KESSIE_IPV6), + A("b.agri", KESSIE_IPV4), + AAAA("b.agri", KESSIE_IPV6), + A("c.agri", KESSIE_IPV4), + AAAA("c.agri", KESSIE_IPV6), + A("os", KESSIE_IPV4), + AAAA("os", KESSIE_IPV6), + A("a.os", KESSIE_IPV4), + AAAA("a.os", KESSIE_IPV6), + A("b.os", KESSIE_IPV4), + AAAA("b.os", KESSIE_IPV6), + A("c.os", KESSIE_IPV4), + AAAA("c.os", KESSIE_IPV6), A("kessie.oob", KESSIE_OOB), // Prometheus server and munin redirect -- 2.45.1 From c07a9bead9311ffa72414cfb14d0951b2cee85d7 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 22 Apr 2024 14:26:32 +0100 Subject: [PATCH 13/16] Add staging blog --- src/openstreetmap.js | 3 +++ src/osmfoundation.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index d3fece1..4421159 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -442,6 +442,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("ridley.ucl", RIDLEY_INTERNAL), A("ridley.oob", RIDLEY_OOB), + A("staging.blog", FUME_IPV4), + AAAA("staging.blog", FUME_IPV6), + // Matomo server A("smaug", SMAUG_IPV4), diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 8c4397c..f36b23a 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -110,6 +110,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("wiki", RIDLEY_IPV4), A("blog", RIDLEY_IPV4), + A("staging.blog", FUME_IPV4), + AAAA("staging.blog", FUME_IPV6), + A("crm", RIDLEY_IPV4), A("join", RIDLEY_IPV4), A("support", RIDLEY_IPV4), -- 2.45.1 From 701876ec5ff6e6341779cd9738d6de53c9e17f3a Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 1 May 2024 17:56:30 +0100 Subject: [PATCH 14/16] Add otrs test domain --- src/openstreetmap.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 4421159..98d05af 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -560,6 +560,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("hot", NAGA_IPV6), A("dmca", NAGA_IPV4), AAAA("dmca", NAGA_IPV6), + + A("test.otrs", NAGA_IPV4), + AAAA("test.otrs", NAGA_IPV6), + A("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), -- 2.45.1 From 28e8e8a68206e11bd4b2ec82c8cbd1c710f66bcb Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 2 May 2024 11:15:54 +0100 Subject: [PATCH 15/16] Add upcoming event domain --- src/openstreetmap.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 98d05af..a478083 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -444,6 +444,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("staging.blog", FUME_IPV4), AAAA("staging.blog", FUME_IPV6), + A("birthday20", FUME_IPV4), + AAAA("birthday20", FUME_IPV6), // Matomo server -- 2.45.1 From e54cbedc71835c4d97a00079b837ea17acd3e668 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 16 May 2024 02:55:43 +0100 Subject: [PATCH 16/16] Move otrs to naga --- src/openstreetmap.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index a478083..36a4016 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -436,7 +436,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Foundation server A("ridley", RIDLEY_IPV4), - A("otrs", RIDLEY_IPV4), A("blog", RIDLEY_IPV4), A("foundation", RIDLEY_IPV4), A("ridley.ucl", RIDLEY_INTERNAL), @@ -562,9 +561,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("hot", NAGA_IPV6), A("dmca", NAGA_IPV4), AAAA("dmca", NAGA_IPV6), - - A("test.otrs", NAGA_IPV4), - AAAA("test.otrs", NAGA_IPV6), + A("otrs", NAGA_IPV4), + AAAA("otrs", NAGA_IPV6), A("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), -- 2.45.1