From 108f25e0b01a8e7b43c931a197fb892da298f3d6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 6 Mar 2025 19:48:07 +0000 Subject: [PATCH 01/16] Point services in Dublin at Equinix IP addresses --- src/ideditor.js | 4 +- src/openstreetmap-town.js | 2 +- src/openstreetmap.js | 84 +++++++++++++++++++-------------------- src/osm-wiki.js | 18 ++++----- src/osmfoundation.js | 4 +- src/stateofthemap.js | 30 +++++++------- src/switch2osm.js | 4 +- 7 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/ideditor.js b/src/ideditor.js index 3c61fd4..2f3ff72 100644 --- a/src/ideditor.js +++ b/src/ideditor.js @@ -28,7 +28,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ALIAS("@", "openstreetmap.github.io."), CNAME("www", "openstreetmap.github.io."), - A("preview", IPV4["naga.he"]), - AAAA("preview", IPV6["naga.he"]) + A("preview", IPV4["naga"]), + AAAA("preview", IPV6["naga"]) ); diff --git a/src/openstreetmap-town.js b/src/openstreetmap-town.js index ccc02ba..e968de5 100644 --- a/src/openstreetmap-town.js +++ b/src/openstreetmap-town.js @@ -34,6 +34,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Redirect en.openstreetmap.town to en.osm.town - osm_web_service("en", "naga.he") + osm_web_service("en", "naga") ); diff --git a/src/openstreetmap.js b/src/openstreetmap.js index b78a5a1..91467ba 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -25,12 +25,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), MX("community", 10, QUALIFY("a.mx")), MX("supporting", 10, QUALIFY("a.mx")), - A("a.mx", IPV4["fafnir.he"]), - AAAA("a.mx", IPV6["fafnir.he"]), - A("mail", IPV4["fafnir.he"]), - AAAA("mail", IPV6["fafnir.he"]), - A("mta-sts", IPV4["fafnir.he"]), - AAAA("mta-sts", IPV6["fafnir.he"]), + A("a.mx", IPV4["fafnir"]), + AAAA("a.mx", IPV6["fafnir"]), + A("mail", IPV4["fafnir"]), + AAAA("mail", IPV6["fafnir"]), + A("mta-sts", IPV4["fafnir"]), + AAAA("mta-sts", IPV6["fafnir"]), // Publish SPF records indicating that only shenron sends mail @@ -186,7 +186,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("b.tile", "dualstack.n.sni.global.fastly.net."), CNAME("c.tile", "dualstack.n.sni.global.fastly.net."), - osm_web_service("render", [ "culebre.he", + osm_web_service("render", [ "culebre", "nidhogg" ]), @@ -198,11 +198,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("backup", IPV4["norbert"]), AAAA("backup", IPV6["norbert"]), - // A("backup", IPV4["horntail.he"]), - // AAAA("backup", IPV6["horntail.he"]), + // A("backup", IPV4["horntail"]), + // AAAA("backup", IPV6["horntail"]), osm_web_service("planet", "norbert"), - // osm_web_service("planet", "horntail.he"), + // osm_web_service("planet", "horntail"), // Development server with wildcard alias for user sites @@ -223,8 +223,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Matomo server - osm_web_service("matomo", "smaug.he"), - osm_web_service("piwik", "smaug.he"), + osm_web_service("matomo", "smaug"), + osm_web_service("piwik", "smaug"), // Imagery servers @@ -262,12 +262,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Management server - osm_web_service("acme", "idris.he"), - osm_web_service("apt", "idris.he"), - osm_web_service("chef", "idris.he"), - osm_web_service("dns", "idris.he"), - osm_web_service("git", "idris.he"), - osm_web_service("hardware", "idris.he"), + osm_web_service("acme", "idris"), + osm_web_service("apt", "idris"), + osm_web_service("chef", "idris"), + osm_web_service("dns", "idris"), + osm_web_service("git", "idris"), + osm_web_service("hardware", "idris"), // Bytemark machine, and the services which operate from it @@ -276,35 +276,35 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Naga services - osm_web_service("svn", "naga.he"), - osm_web_service("trac", "naga.he"), - osm_web_service("irc", "naga.he"), - osm_web_service("blogs", "naga.he"), - osm_web_service("welcome", "naga.he"), - osm_web_service("operations", "naga.he"), - osm_web_service("hot", "naga.he"), - osm_web_service("dmca", "naga.he"), - osm_web_service("otrs", "naga.he", { h1: true, h2: false }), // OTRS is not available using HTTPS/2 - osm_web_service("birthday20", "naga.he"), + osm_web_service("svn", "naga"), + osm_web_service("trac", "naga"), + osm_web_service("irc", "naga"), + osm_web_service("blogs", "naga"), + osm_web_service("welcome", "naga"), + osm_web_service("operations", "naga"), + osm_web_service("hot", "naga"), + osm_web_service("dmca", "naga"), + osm_web_service("otrs", "naga", { h1: true, h2: false }), // OTRS is not available using HTTPS/2 + osm_web_service("birthday20", "naga"), // Wiki servers - osm_web_service("wiki", "konqi.he"), + osm_web_service("wiki", "konqi"), // Overpass server - osm_web_service("query", "grisu.he"), + osm_web_service("query", "grisu"), // GPS tile server - osm_web_service("gps-tile", "muirdris.he"), - osm_web_service("a.gps-tile", "muirdris.he"), - osm_web_service("b.gps-tile", "muirdris.he"), - osm_web_service("c.gps-tile", "muirdris.he"), - osm_web_service("gps.tile", "muirdris.he"), - osm_web_service("gps-a.tile", "muirdris.he"), - osm_web_service("gps-b.tile", "muirdris.he"), - osm_web_service("gps-c.tile", "muirdris.he"), + osm_web_service("gps-tile", "muirdris"), + osm_web_service("a.gps-tile", "muirdris"), + osm_web_service("b.gps-tile", "muirdris"), + osm_web_service("c.gps-tile", "muirdris"), + osm_web_service("gps.tile", "muirdris"), + osm_web_service("gps-a.tile", "muirdris"), + osm_web_service("gps-b.tile", "muirdris"), + osm_web_service("gps-c.tile", "muirdris"), // Donation site and new OSMF crm site @@ -314,10 +314,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Discourse server ("community") - osm_web_service("community", "fume.he"), - osm_web_service("communities", "fume.he"), - osm_web_service("c", "fume.he"), - osm_web_service("forum", "fume.he"), + osm_web_service("community", "fume"), + osm_web_service("communities", "fume"), + osm_web_service("c", "fume"), + osm_web_service("forum", "fume"), CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"), diff --git a/src/osm-wiki.js b/src/osm-wiki.js index 899fc36..b5e96e9 100644 --- a/src/osm-wiki.js +++ b/src/osm-wiki.js @@ -20,12 +20,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), MX("@", 10, QUALIFY("a.mx")), - A("a.mx", IPV4["fafnir.he"]), - AAAA("a.mx", IPV6["fafnir.he"]), - A("mail", IPV4["fafnir.he"]), - AAAA("mail", IPV6["fafnir.he"]), - A("mta-sts", IPV4["fafnir.he"]), - AAAA("mta-sts", IPV6["fafnir.he"]), + A("a.mx", IPV4["fafnir"]), + AAAA("a.mx", IPV6["fafnir"]), + A("mail", IPV4["fafnir"]), + AAAA("mail", IPV6["fafnir"]), + A("mta-sts", IPV4["fafnir"]), + AAAA("mta-sts", IPV6["fafnir"]), // Delegate SPF policy to the main domain @@ -58,8 +58,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"), TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"), - osm_web_service("wiki", "konqi.he"), - osm_web_service("www", "konqi.he"), - osm_web_service("@", "konqi.he") + osm_web_service("wiki", "konqi"), + osm_web_service("www", "konqi"), + osm_web_service("@", "konqi") ); diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 0ad8995..70c1d87 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -103,7 +103,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("board", "ridley"), osm_web_service("dwg", "ridley"), osm_web_service("mwg", "ridley"), - osm_web_service("operations", "naga.he"), + osm_web_service("operations", "naga"), // Nextcloud instance @@ -112,6 +112,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Staging Blog osm_web_service("staging.blog", "tabaluga"), - osm_web_service("hardware", "idris.he"), + osm_web_service("hardware", "idris"), ); diff --git a/src/stateofthemap.js b/src/stateofthemap.js index 5c1770a..1dae3bc 100644 --- a/src/stateofthemap.js +++ b/src/stateofthemap.js @@ -46,24 +46,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - osm_web_service("@", "naga.he"), - osm_web_service("www", "naga.he"), - osm_web_service("2025", "naga.he"), - osm_web_service("2024", "naga.he"), - osm_web_service("2022", "naga.he"), - osm_web_service("2021", "naga.he"), - osm_web_service("2020", "naga.he"), - osm_web_service("2019", "naga.he"), - osm_web_service("2018", "naga.he"), - osm_web_service("2017", "naga.he"), - osm_web_service("2016", "naga.he"), - osm_web_service("2013", "naga.he"), + osm_web_service("@", "naga"), + osm_web_service("www", "naga"), + osm_web_service("2025", "naga"), + osm_web_service("2024", "naga"), + osm_web_service("2022", "naga"), + osm_web_service("2021", "naga"), + osm_web_service("2020", "naga"), + osm_web_service("2019", "naga"), + osm_web_service("2018", "naga"), + osm_web_service("2017", "naga"), + osm_web_service("2016", "naga"), + osm_web_service("2013", "naga"), osm_web_service("2012", "ridley"), osm_web_service("2011", "ridley"), osm_web_service("2010", "ridley"), - osm_web_service("2009", "naga.he"), - osm_web_service("2008", "naga.he"), - osm_web_service("2007", "naga.he"), + osm_web_service("2009", "naga"), + osm_web_service("2008", "naga"), + osm_web_service("2007", "naga"), // Google Site Verification - Grant TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo"), diff --git a/src/switch2osm.js b/src/switch2osm.js index bccbbfe..a17179c 100644 --- a/src/switch2osm.js +++ b/src/switch2osm.js @@ -26,7 +26,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - osm_web_service("@", "naga.he"), - osm_web_service("www", "naga.he") + osm_web_service("@", "naga"), + osm_web_service("www", "naga") ); -- 2.39.5 From a359effcfbbd6316786f54426cb1be439be6ef33 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 9 Mar 2025 19:57:43 +0000 Subject: [PATCH 02/16] Use end trailing now that supported --- src/opengeodata.js | 2 +- src/openstreetmap-mg.js | 2 +- src/openstreetmap-nz.js | 2 +- src/openstreetmap-town.js | 2 +- src/openstreetmap-uk.js | 2 +- src/openstreetmap-za.js | 2 +- src/osm-li.js | 2 +- src/osm-wiki.js | 2 +- src/osm2pgsql.js | 2 +- src/ptr_equinix_ams_ipv4.js | 2 +- src/ptr_equinix_ams_ipv6.js | 2 +- src/ptr_equinix_dub_ipv4.js | 2 +- src/ptr_equinix_dub_ipv6.js | 2 +- src/ptr_he_ams_ipv4.js | 2 +- src/ptr_he_ams_ipv6.js | 2 +- src/ptr_he_dub_ipv4.js | 2 +- src/ptr_he_dub_ipv6.js | 2 +- src/stateofthemap-eu.js | 2 +- src/stateofthemap.js | 2 +- src/switch2osm.js | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/opengeodata.js b/src/opengeodata.js index 738c7d2..8d84a80 100644 --- a/src/opengeodata.js +++ b/src/opengeodata.js @@ -28,6 +28,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("@", "ridley"), osm_web_service("old", "ridley"), // Legacy URL support https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/ - osm_web_service("www", "ridley") + osm_web_service("www", "ridley"), ); diff --git a/src/openstreetmap-mg.js b/src/openstreetmap-mg.js index 80ae23c..3481492 100644 --- a/src/openstreetmap-mg.js +++ b/src/openstreetmap-mg.js @@ -24,6 +24,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ALIAS("@", "openstreetmap-madagascar.github.io."), CNAME("www", "openstreetmap-madagascar.github.io."), - CNAME("sotm2024", "openstreetmap-madagascar.github.io.") + CNAME("sotm2024", "openstreetmap-madagascar.github.io."), ); \ No newline at end of file diff --git a/src/openstreetmap-nz.js b/src/openstreetmap-nz.js index e2b903d..3f69477 100644 --- a/src/openstreetmap-nz.js +++ b/src/openstreetmap-nz.js @@ -36,6 +36,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ALIAS("@", "www.openstreetmap.org."), CNAME("www", "www.openstreetmap.org."), - CNAME("api", "api.openstreetmap.org.") + CNAME("api", "api.openstreetmap.org."), ); diff --git a/src/openstreetmap-town.js b/src/openstreetmap-town.js index e968de5..1390487 100644 --- a/src/openstreetmap-town.js +++ b/src/openstreetmap-town.js @@ -34,6 +34,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Redirect en.openstreetmap.town to en.osm.town - osm_web_service("en", "naga") + osm_web_service("en", "naga"), ); diff --git a/src/openstreetmap-uk.js b/src/openstreetmap-uk.js index db62c6a..a0c4d51 100644 --- a/src/openstreetmap-uk.js +++ b/src/openstreetmap-uk.js @@ -62,6 +62,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("ea", "lockheed"), osm_web_service("a.ea", "lockheed"), osm_web_service("b.ea", "lockheed"), - osm_web_service("c.ea", "lockheed") + osm_web_service("c.ea", "lockheed"), ); diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js index 1167f28..5f8e5c1 100644 --- a/src/openstreetmap-za.js +++ b/src/openstreetmap-za.js @@ -58,6 +58,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("namibia-topo", "lockheed"), osm_web_service("a.namibia-topo", "lockheed"), osm_web_service("b.namibia-topo", "lockheed"), - osm_web_service("c.namibia-topo", "lockheed") + osm_web_service("c.namibia-topo", "lockheed"), ); diff --git a/src/osm-li.js b/src/osm-li.js index e8f0f7b..19807db 100644 --- a/src/osm-li.js +++ b/src/osm-li.js @@ -4,6 +4,6 @@ D(DOMAIN, REGISTRAR, NAMESERVER("palpuogna.sosm.ch."), NAMESERVER("ns.poole.ch."), NAMESERVER("he.poole.ch."), - NAMESERVER("ns3.spreng.ch.") + NAMESERVER("ns3.spreng.ch."), ); diff --git a/src/osm-wiki.js b/src/osm-wiki.js index b5e96e9..39f9717 100644 --- a/src/osm-wiki.js +++ b/src/osm-wiki.js @@ -60,6 +60,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("wiki", "konqi"), osm_web_service("www", "konqi"), - osm_web_service("@", "konqi") + osm_web_service("@", "konqi"), ); diff --git a/src/osm2pgsql.js b/src/osm2pgsql.js index e7cb962..391e827 100644 --- a/src/osm2pgsql.js +++ b/src/osm2pgsql.js @@ -21,6 +21,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("www", "2a01:4f8:1c17:6433::2"), // Test server for osm2pgsql development - A("test", "135.181.221.216") + A("test", "135.181.221.216"), ); diff --git a/src/ptr_equinix_ams_ipv4.js b/src/ptr_equinix_ams_ipv4.js index dd6cc43..3245ec4 100644 --- a/src/ptr_equinix_ams_ipv4.js +++ b/src/ptr_equinix_ams_ipv4.js @@ -10,5 +10,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV4["spike-08"], "spike-08.openstreetmap.org."), PTR(IPV4["tabaluga"], "tabaluga.openstreetmap.org."), PTR(IPV4["vhagar"], "vhagar.openstreetmap.org."), - PTR(IPV4["switch1.ams"], "switch1.ams.openstreetmap.org.") + PTR(IPV4["switch1.ams"], "switch1.ams.openstreetmap.org."), ); diff --git a/src/ptr_equinix_ams_ipv6.js b/src/ptr_equinix_ams_ipv6.js index f5c7659..db746c7 100644 --- a/src/ptr_equinix_ams_ipv6.js +++ b/src/ptr_equinix_ams_ipv6.js @@ -10,5 +10,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV6["spike-08"], "spike-08.openstreetmap.org."), PTR(IPV6["tabaluga"], "tabaluga.openstreetmap.org."), PTR(IPV6["vhagar"], "vhagar.openstreetmap.org."), - PTR(IPV6["switch1.ams"], "switch1.ams.openstreetmap.org.") + PTR(IPV6["switch1.ams"], "switch1.ams.openstreetmap.org."), ); diff --git a/src/ptr_equinix_dub_ipv4.js b/src/ptr_equinix_dub_ipv4.js index f726d07..0330b6d 100644 --- a/src/ptr_equinix_dub_ipv4.js +++ b/src/ptr_equinix_dub_ipv4.js @@ -13,5 +13,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV4["spike-01"], "spike-01.openstreetmap.org."), PTR(IPV4["spike-02"], "spike-02.openstreetmap.org."), PTR(IPV4["spike-03"], "spike-03.openstreetmap.org."), - PTR(IPV4["switch1.dub"], "switch1.dub.openstreetmap.org.") + PTR(IPV4["switch1.dub"], "switch1.dub.openstreetmap.org."), ); diff --git a/src/ptr_equinix_dub_ipv6.js b/src/ptr_equinix_dub_ipv6.js index e06c3e7..0e5fdae 100644 --- a/src/ptr_equinix_dub_ipv6.js +++ b/src/ptr_equinix_dub_ipv6.js @@ -13,5 +13,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV6["spike-01"], "spike-01.openstreetmap.org."), PTR(IPV6["spike-02"], "spike-02.openstreetmap.org."), PTR(IPV6["spike-03"], "spike-03.openstreetmap.org."), - PTR(IPV6["switch1.dub"], "switch1.dub.openstreetmap.org.") + PTR(IPV6["switch1.dub"], "switch1.dub.openstreetmap.org."), ); diff --git a/src/ptr_he_ams_ipv4.js b/src/ptr_he_ams_ipv4.js index a6d42c0..d1f2406 100644 --- a/src/ptr_he_ams_ipv4.js +++ b/src/ptr_he_ams_ipv4.js @@ -10,5 +10,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV4["spike-08.he"], "spike-08.he.openstreetmap.org."), PTR(IPV4["tabaluga.he"], "tabaluga.he.openstreetmap.org."), PTR(IPV4["vhagar.he"], "vhagar.he.openstreetmap.org."), - PTR(IPV4["switch1.he.ams"], "switch1.he.ams.openstreetmap.org.") + PTR(IPV4["switch1.he.ams"], "switch1.he.ams.openstreetmap.org."), ); diff --git a/src/ptr_he_ams_ipv6.js b/src/ptr_he_ams_ipv6.js index e8e1b3c..f4a60f0 100644 --- a/src/ptr_he_ams_ipv6.js +++ b/src/ptr_he_ams_ipv6.js @@ -10,5 +10,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV6["spike-08.he"], "spike-08.he.openstreetmap.org."), PTR(IPV6["tabaluga.he"], "tabaluga.he.openstreetmap.org."), PTR(IPV6["vhagar.he"], "vhagar.he.openstreetmap.org."), - PTR(IPV6["switch1.he.ams"], "switch1.he.ams.openstreetmap.org.") + PTR(IPV6["switch1.he.ams"], "switch1.he.ams.openstreetmap.org."), ); diff --git a/src/ptr_he_dub_ipv4.js b/src/ptr_he_dub_ipv4.js index bc24c37..0f17bb1 100644 --- a/src/ptr_he_dub_ipv4.js +++ b/src/ptr_he_dub_ipv4.js @@ -14,5 +14,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV4["spike-01.he"], "spike-01.he.openstreetmap.org."), PTR(IPV4["spike-02.he"], "spike-02.he.openstreetmap.org."), PTR(IPV4["spike-03.he"], "spike-03.he.openstreetmap.org."), - PTR(IPV4["switch1.he.dub"], "switch1.he.dub.openstreetmap.org.") + PTR(IPV4["switch1.he.dub"], "switch1.he.dub.openstreetmap.org."), ); diff --git a/src/ptr_he_dub_ipv6.js b/src/ptr_he_dub_ipv6.js index 7ed465c..15e1357 100644 --- a/src/ptr_he_dub_ipv6.js +++ b/src/ptr_he_dub_ipv6.js @@ -13,5 +13,5 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), PTR(IPV6["spike-01.he"], "spike-01.he.openstreetmap.org."), PTR(IPV6["spike-02.he"], "spike-02.he.openstreetmap.org."), PTR(IPV6["spike-03.he"], "spike-03.he.openstreetmap.org."), - PTR(IPV6["switch1.he.dub"], "switch1.he.dub.openstreetmap.org.") + PTR(IPV6["switch1.he.dub"], "switch1.he.dub.openstreetmap.org."), ); diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 0f1aa12..164239b 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -28,6 +28,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("2014", "49.12.5.171"), CNAME("2023", "osmbe.github.io."), - CNAME("2024", "openstreetmap-polska.github.io.") + CNAME("2024", "openstreetmap-polska.github.io."), ); diff --git a/src/stateofthemap.js b/src/stateofthemap.js index 1dae3bc..f958816 100644 --- a/src/stateofthemap.js +++ b/src/stateofthemap.js @@ -67,6 +67,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Google Site Verification - Grant TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo"), - TXT("@", "google-site-verification=pqJHZHtrC4UhevQdPlR_2gVDPml6UCwmyHq75bfWLRQ") + TXT("@", "google-site-verification=pqJHZHtrC4UhevQdPlR_2gVDPml6UCwmyHq75bfWLRQ"), ); diff --git a/src/switch2osm.js b/src/switch2osm.js index a17179c..cf4b9ce 100644 --- a/src/switch2osm.js +++ b/src/switch2osm.js @@ -27,6 +27,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases osm_web_service("@", "naga"), - osm_web_service("www", "naga") + osm_web_service("www", "naga"), ); -- 2.39.5 From e72ba3cf2c07030aa278c32ab5dedc62fd6ea183 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 22 Mar 2025 11:16:28 +0000 Subject: [PATCH 03/16] Add wiki test domain --- src/openstreetmap.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 91467ba..83b1a03 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -290,6 +290,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Wiki servers osm_web_service("wiki", "konqi"), + osm_web_service("test.wiki", "muirdris"), // Overpass server -- 2.39.5 From 4ae740f971a5a3769c6d70216189fc7980b96853 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 23 Apr 2025 15:09:47 +0100 Subject: [PATCH 04/16] Update stateofthemap.eu for State of the Map Europe 2025 --- src/stateofthemap-eu.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 164239b..6b4783b 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -13,16 +13,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ], }), - // Block email delivery + // Email delivery + SPF_BUILDER({ + label: "@", + parts: [ + "v=spf1", + "include:secureserver.net", + "-all" + ] + }), + + TXT("_dmarc", "v=DMARC1; p=none;"), + + CNAME("k2._domainkey", "dkim2.mcsv.net."), + CNAME("k3._domainkey", "dkim3.mcsv.net."), + A("mail", "92.205.4.228"), - TXT("_dmarc", "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;"), - TXT("*._domainkey", "v=DKIM1; p="), - TXT("@", "v=spf1 -all"), + MX("mail", 10, "mail"), - // Site hosted on github pages + // 2025 SoTM site - ALIAS("@", "openstreetmap-polska.github.io."), - CNAME("www", "openstreetmap-polska.github.io."), + A("@", "92.205.4.228"), + A("www", "92.205.4.228"), // Previous editions -- 2.39.5 From a56d79e3ee46feb9963c92bcd0e99b7295062a87 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 25 Apr 2025 14:16:48 +0100 Subject: [PATCH 05/16] sotm.eu go-live Closes: https://github.com/openstreetmap/operations/issues/1232 --- src/stateofthemap-eu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 6b4783b..a7db4c1 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -33,8 +33,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 2025 SoTM site - A("@", "92.205.4.228"), - A("www", "92.205.4.228"), + ALIAS("@", "osm-uk.github.io."), + CNAME("www", "osm-uk.github.io."), // Previous editions -- 2.39.5 From 42d9689c573331a3d6c921b6e98d40bc235e21e3 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 25 Apr 2025 14:53:36 +0100 Subject: [PATCH 06/16] sotm-eu: add 2025 cname --- src/stateofthemap-eu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index a7db4c1..48e4a30 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -35,6 +35,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ALIAS("@", "osm-uk.github.io."), CNAME("www", "osm-uk.github.io."), + CNAME("2025", "osm-uk.github.io."), // Previous editions -- 2.39.5 From 11aa9e8924de0750710af8871ce71429c9671436 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 25 Apr 2025 15:16:48 +0100 Subject: [PATCH 07/16] Add sotm.eu redirects --- src/stateofthemap-eu.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 48e4a30..b19a750 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -33,8 +33,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // 2025 SoTM site - ALIAS("@", "osm-uk.github.io."), - CNAME("www", "osm-uk.github.io."), + ALIAS("@", "osm-uk.github.io.", CF_PROXY_ON), + CNAME("www", "osm-uk.github.io.", CF_PROXY_ON), + CF_SINGLE_REDIRECT("sotm-eu-root", 302, "stateofthemap.eu", "2025.stateofthemap.eu"), + CF_SINGLE_REDIRECT("soth-eu-year", 302, "www.stateofthemap.eu", "2025.stateofthemap.eu"), + CNAME("2025", "osm-uk.github.io."), // Previous editions -- 2.39.5 From b9227e36f60a576d2009ddcacf37326d2c74448e Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 25 Apr 2025 15:39:29 +0100 Subject: [PATCH 08/16] Point at sotm-eu index on naga --- src/stateofthemap-eu.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index b19a750..92af427 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -31,13 +31,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), MX("mail", 10, "mail"), - // 2025 SoTM site - - ALIAS("@", "osm-uk.github.io.", CF_PROXY_ON), - CNAME("www", "osm-uk.github.io.", CF_PROXY_ON), - CF_SINGLE_REDIRECT("sotm-eu-root", 302, "stateofthemap.eu", "2025.stateofthemap.eu"), - CF_SINGLE_REDIRECT("soth-eu-year", 302, "www.stateofthemap.eu", "2025.stateofthemap.eu"), + // Web service for stateofthemap.eu index site + osm_web_service("@", "naga"), + osm_web_service("www", "naga"), + // 2025 SoTM site CNAME("2025", "osm-uk.github.io."), // Previous editions -- 2.39.5 From 5512fd3bbbfc55aeec6922a642b7130e365dd294 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 29 Apr 2025 12:52:26 +0100 Subject: [PATCH 09/16] sotm-eu: fix mx record --- src/stateofthemap-eu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 92af427..b3cabe0 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -29,7 +29,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("k3._domainkey", "dkim3.mcsv.net."), A("mail", "92.205.4.228"), - MX("mail", 10, "mail"), + MX("@", 10, "mail"), // Web service for stateofthemap.eu index site osm_web_service("@", "naga"), -- 2.39.5 From 8207197e226602ce5368828df55185b9b8620437 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 1 May 2025 16:38:10 +0100 Subject: [PATCH 10/16] Add test.civicrm.openstreetmap.org test dommain --- src/openstreetmap.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 83b1a03..568ad3a 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -313,6 +313,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("support", "ridley"), osm_web_service("supporting", "ridley"), + osm_web_service("test.civicrm", "muirdris"), + // Discourse server ("community") osm_web_service("community", "fume"), -- 2.39.5 From fc0758e6b64f8fd2474420f7e980ae1fd1a6a69d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 10 Jun 2025 18:59:51 +0100 Subject: [PATCH 11/16] move help to container on naga --- src/openstreetmap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 568ad3a..1f323b9 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -272,7 +272,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Bytemark machine, and the services which operate from it osm_web_service("lists", "shenron"), - osm_web_service("help", "shenron"), // Naga services @@ -286,6 +285,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("dmca", "naga"), osm_web_service("otrs", "naga", { h1: true, h2: false }), // OTRS is not available using HTTPS/2 osm_web_service("birthday20", "naga"), + osm_web_service("help", "naga"), // Wiki servers -- 2.39.5 From 09ef6c81e842225e992e803059aa868b68aa4c2a Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 11 Jun 2025 17:38:10 +0100 Subject: [PATCH 12/16] Add awards.osm.org - external alias --- src/openstreetmap.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 1f323b9..cfea421 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -333,4 +333,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("staging.blog", "tabaluga"), + // Awards (external - Ilya Zverev) + ALIAS("awards", "awards.osmz.ee."), + ); -- 2.39.5 From ee8a9fb82f34322391bad73a9b85be33acf62ce2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 26 Jul 2025 17:06:55 +0100 Subject: [PATCH 13/16] Add orm to DNS --- src/ipv4.json | 1 + src/ipv6.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/ipv4.json b/src/ipv4.json index c132ac6..6be960e 100644 --- a/src/ipv4.json +++ b/src/ipv4.json @@ -86,6 +86,7 @@ "odin.oob": "10.0.49.15", "oob1.ams": "10.0.48.102", "oob1.dub": "10.0.64.102", + "orm": "23.139.196.5", "palulukon": "3.144.0.72", "piasa": "140.211.167.101", "piasa.oob": "10.0.0.198", diff --git a/src/ipv6.json b/src/ipv6.json index b345f49..f673927 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -44,6 +44,7 @@ "norbert.he": "2001:470:1:fa1::11", "odin": "2001:4d78:500:5e3::f", "odin.he": "2001:470:1:fa1::f", + "orm": "2602:f629:0:bc::2", "piasa": "2605:bc80:3010:700::8cd3:a765", "rhaegal": "2001:b68:40ff:3::2", "shenron": "2001:41c9:1:400::32", -- 2.39.5 From cfb510a8f5d12e08faaa5a73a571ca21c44ef11d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 4 Aug 2025 18:56:08 +0100 Subject: [PATCH 14/16] Add palulukon IPv6 --- src/ipv6.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ipv6.json b/src/ipv6.json index f673927..4554906 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -45,6 +45,7 @@ "odin": "2001:4d78:500:5e3::f", "odin.he": "2001:470:1:fa1::f", "orm": "2602:f629:0:bc::2", + "palulukon": "2600:1f16:126d:9400:48bc:5b5e:6d26:beb8", "piasa": "2605:bc80:3010:700::8cd3:a765", "rhaegal": "2001:b68:40ff:3::2", "shenron": "2001:41c9:1:400::32", -- 2.39.5 From 5895212fe5993c43e332620266a467dbcf32da51 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 6 Aug 2025 16:57:47 +0100 Subject: [PATCH 15/16] Use new DKIM_BUILDER for osmfoundation. dnscontrol 4.23.0+ --- src/osmfoundation.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 70c1d87..2f9ec3b 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -61,10 +61,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), failureOptions: 1 }), - // DKIM keys - - TXT("google._domainkey", "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z/fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB"), - TXT("20201112._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4OyJc77mpW5djxVfZm18HcmJHQLpo7B2Z8Og8byICjDiG91Tpkv5ws3xIbMsi/tVA6p5L76uL0TGKlo4ayewYvJUTC22+hBWARUuWA0DgeMwBpW/dNUOJHBABCTouolvXLKRTPTefA177Y5jYbD7ZeJAR4ZnFbZX6spimXCT66AyhqCBSrOCXYXFm3ons5ANkkQBNZ/jMYczYs9T1ijNEbBNTJmLO+whOrYLyGd3iZ9X9iOmuNFBCgXp0tsN//FBsOyTl559/XY25r3GZhiKXMbrZ1IJewqJlG0+hN1y9qwWGgq5YpZPt5YJ1KGjIrcFX59/PhNQX4khPOaD5g7ZQIDAQAB", AUTOSPLIT), + // Google Workspace DKIM keys + DKIM_BUILDER({ + selector: "google", + keytype: 'rsa', + pubkey: "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z/fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB" + }), + DKIM_BUILDER({ + selector: "20201112", + keytype: 'rsa', + pubkey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4OyJc77mpW5djxVfZm18HcmJHQLpo7B2Z8Og8byICjDiG91Tpkv5ws3xIbMsi/tVA6p5L76uL0TGKlo4ayewYvJUTC22+hBWARUuWA0DgeMwBpW/dNUOJHBABCTouolvXLKRTPTefA177Y5jYbD7ZeJAR4ZnFbZX6spimXCT66AyhqCBSrOCXYXFm3ons5ANkkQBNZ/jMYczYs9T1ijNEbBNTJmLO+whOrYLyGd3iZ9X9iOmuNFBCgXp0tsN//FBsOyTl559/XY25r3GZhiKXMbrZ1IJewqJlG0+hN1y9qwWGgq5YpZPt5YJ1KGjIrcFX59/PhNQX4khPOaD5g7ZQIDAQAB" + }), // https://kb.mailbox.org/en/private/custom-domains/spf-dkim-and-dmarc-how-to-improve-spam-reputation-and-avoid-bounces CNAME("MBO0001._domainkey", "MBO0001._domainkey.mailbox.org."), -- 2.39.5 From 27c40ac095666397021af0303b8c9ed270e879ac Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 6 Aug 2025 17:13:13 +0100 Subject: [PATCH 16/16] Remove broken aliases on openstreetmap.mg --- src/openstreetmap-mg.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openstreetmap-mg.js b/src/openstreetmap-mg.js index 3481492..b669ffe 100644 --- a/src/openstreetmap-mg.js +++ b/src/openstreetmap-mg.js @@ -19,10 +19,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), TXT("*._domainkey", "v=DKIM1; p="), TXT("@", "v=spf1 -all"), - // Site hosted on github pages + ALIAS("@", "www.openstreetmap.org."), + CNAME("www", "www.openstreetmap.org."), - ALIAS("@", "openstreetmap-madagascar.github.io."), - CNAME("www", "openstreetmap-madagascar.github.io."), + // Site hosted on github pages CNAME("sotm2024", "openstreetmap-madagascar.github.io."), -- 2.39.5