From cfb510a8f5d12e08faaa5a73a571ca21c44ef11d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 4 Aug 2025 18:56:08 +0100 Subject: [PATCH 01/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 02/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 03/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 From 3aef094fea1bbbbab894c8b4d011cd989d231337 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 11:11:19 +0000 Subject: [PATCH 04/16] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index cf4d39f..f8a56a9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install dependencies run: | -- 2.39.5 From 3aebb3f269942fe80aaa2e1e406f010d33d29ed2 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 21 Aug 2025 09:03:05 +0100 Subject: [PATCH 05/16] Use equinix addresses for longma --- src/nominatim.openstreetmap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nominatim.openstreetmap.yml b/src/nominatim.openstreetmap.yml index a8e45c8..210e990 100644 --- a/src/nominatim.openstreetmap.yml +++ b/src/nominatim.openstreetmap.yml @@ -15,8 +15,8 @@ europe: - 6224537 requests: 700 name: longma - ipv4: 184.104.226.109 - ipv6: 2001:470:1:b3b::d + ipv4: 87.252.214.109 + ipv6: 2001:4d78:fe03:1c::d - statuscake: - 6726828 - 6726827 -- 2.39.5 From dc7390943359a8fc22e3152910bb28c0fd825c38 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 23 Aug 2025 15:21:18 +0100 Subject: [PATCH 06/16] Remove some old names from DNS --- src/ipv4.json | 4 ---- src/ipv6.json | 1 - 2 files changed, 5 deletions(-) diff --git a/src/ipv4.json b/src/ipv4.json index 6be960e..f21bc56 100644 --- a/src/ipv4.json +++ b/src/ipv4.json @@ -55,7 +55,6 @@ "konqi.he": "184.104.226.103", "konqi.dub": "10.0.64.7", "konqi.oob": "10.0.65.7", - "ladon": "83.212.2.116", "lockheed": "82.199.86.112", "lockheed.he": "184.104.179.144", "lockheed.ams": "10.0.48.16", @@ -73,7 +72,6 @@ "naga.he": "184.104.226.104", "naga.dub": "10.0.64.8", "naga.oob": "10.0.65.8", - "neak": "89.234.177.142", "nidhogg": "194.71.11.111", "nidhogg.oob": "130.239.18.115", "norbert": "82.199.86.113", @@ -95,8 +93,6 @@ "pdu1.dub": "10.0.64.100", "pdu2.dub": "10.0.64.101", "rhaegal": "193.198.233.218", - "ridgeback": "31.169.50.10", - "ridgeback.oob": "31.169.50.14", "ridley": "193.60.236.19", "ridley.ucl": "10.0.0.3", "ridley.oob": "10.0.1.3", diff --git a/src/ipv6.json b/src/ipv6.json index 4554906..7e14ea5 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -29,7 +29,6 @@ "idris.he": "2001:470:1:b3b::6", "konqi": "2001:4d78:fe03:1c::7", "konqi.he": "2001:470:1:b3b::7", - "ladon": "2001:648:2ffe:4::116", "lockheed": "2001:4d78:500:5e3::10", "lockheed.he": "2001:470:1:fa1::10", "longma": "2001:4d78:fe03:1c::d", -- 2.39.5 From a88443ed8c5d7cc64caf0369a42801bc14b97ee7 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 26 Aug 2025 04:04:12 +0100 Subject: [PATCH 07/16] Add notes about domain registration --- dnsconfig.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dnsconfig.js b/dnsconfig.js index 06d230a..f825ad3 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -147,8 +147,8 @@ try { OPENSTREETMAP("openstreetmap.org", REG_GANDI); OPENSTREETMAP("openstreetmap.com", REG_GANDI); OPENSTREETMAP("openstreetmap.net", REG_GANDI); -OPENSTREETMAP("openstreetmap.ca", REG_GANDI); -OPENSTREETMAP("openstreetmap.eu", REG_NONE); +OPENSTREETMAP("openstreetmap.ca", REG_GANDI); // Richard Weait managed the registration +OPENSTREETMAP("openstreetmap.eu", REG_NONE); // fossgis.de manages the registration OPENSTREETMAP("openstreetmap.pro", REG_GANDI); OPENSTREETMAP("openstreetmap.gay", REG_GANDI); OPENSTREETMAP("openstreetmaps.org", REG_GANDI); @@ -225,8 +225,8 @@ OPENSTREETMAP_UK("openstreetmap.co.uk", REG_GANDI); var OPENSTREETMAP_ZA = loadTemplate("openstreetmap-za"); -OPENSTREETMAP_ZA("openstreetmap.org.za", REG_NONE); -OPENSTREETMAP_ZA("osm.org.za", REG_NONE); +OPENSTREETMAP_ZA("openstreetmap.org.za", REG_NONE); // Registration managed by Grant Slater via https://www.vweb.co.za/ +OPENSTREETMAP_ZA("osm.org.za", REG_NONE); // Registration managed by Grant Slater via https://www.vweb.co.za/ var OSMFOUNDATION = loadTemplate("osmfoundation"); -- 2.39.5 From 84712cc1e8290b0b83aef563955be30c88068ded Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 26 Aug 2025 05:47:08 +0100 Subject: [PATCH 08/16] Minor GHA dns check clean-up --- .github/workflows/check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f8a56a9..6d4d0c8 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -31,9 +31,10 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | + set -euo pipefail arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \ && gh release download --repo https://github.com/StackExchange/dnscontrol --pattern "dnscontrol-*.${arch}.deb" --output /tmp/dnscontrol.deb \ - && sudo apt install /tmp/dnscontrol.deb -y + && sudo apt-get install /tmp/dnscontrol.deb -y - name: Run Check run: | -- 2.39.5 From c04f6273e174b072c341028c9294ebe6737f5630 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 26 Aug 2025 12:06:39 +0100 Subject: [PATCH 09/16] Remove palulukon IPv6 for the moment. Faulty --- src/ipv6.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ipv6.json b/src/ipv6.json index 7e14ea5..d6b4ab0 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -44,7 +44,6 @@ "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 8d5ea4cce886cd1196be0ad91cfef6d75c2fb720 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 30 Aug 2025 22:20:55 +0100 Subject: [PATCH 10/16] Add azure-01/02 IPv4 --- src/ipv4.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ipv4.json b/src/ipv4.json index f21bc56..3a8988f 100644 --- a/src/ipv4.json +++ b/src/ipv4.json @@ -2,6 +2,8 @@ "albi": "51.159.53.238", "angor": "196.10.54.165", "ats1.ams": "10.0.48.103", + "azure-01": "103.147.22.156", + "azure-02": "103.147.22.157", "cmok": "64.225.143.127", "culebre": "87.252.214.105", "culebre.he": "184.104.226.105", -- 2.39.5 From 9ec5282cc921613cc656e6cc9d5b48223f63553e Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 1 Sep 2025 21:59:33 +0100 Subject: [PATCH 11/16] Add DNS for Bulgaria and Brazil imagery --- src/openstreetmap.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index cfea421..abba69a 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -255,6 +255,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("b.us-imagery", "lockheed"), osm_web_service("c.us-imagery", "lockheed"), + osm_web_service("bg-imagery", "lockheed"), + osm_web_service("a.bg-imagery", "lockheed"), + osm_web_service("b.bg-imagery", "lockheed"), + osm_web_service("c.bg-imagery", "lockheed"), + + osm_web_service("br-imagery", "lockheed"), + osm_web_service("a.br-imagery", "lockheed"), + osm_web_service("b.br-imagery", "lockheed"), + osm_web_service("c.br-imagery", "lockheed"), + // Prometheus server and munin redirect osm_web_service("prometheus", "stormfly-03"), -- 2.39.5 From eef3df37d6f74c849968ea880937535e8036ee40 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 1 Sep 2025 23:46:10 +0100 Subject: [PATCH 12/16] Add azure-01/02 oob IPs --- src/ipv4.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ipv4.json b/src/ipv4.json index 3a8988f..6b591fd 100644 --- a/src/ipv4.json +++ b/src/ipv4.json @@ -3,7 +3,9 @@ "angor": "196.10.54.165", "ats1.ams": "10.0.48.103", "azure-01": "103.147.22.156", + "azure-01.oob": "10.122.4.171", "azure-02": "103.147.22.157", + "azure-02.oob": "10.122.4.172", "cmok": "64.225.143.127", "culebre": "87.252.214.105", "culebre.he": "184.104.226.105", -- 2.39.5 From f9f1f1fca732995d680396d42be08e86a0372a4a Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 3 Sep 2025 11:29:15 +0100 Subject: [PATCH 13/16] Revert "Remove palulukon IPv6 for the moment. Faulty" This reverts commit c04f6273e174b072c341028c9294ebe6737f5630. --- src/ipv6.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ipv6.json b/src/ipv6.json index d6b4ab0..7e14ea5 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -44,6 +44,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 ade576724c7a97ef7d68d501f8e9ba14c2f19f2c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 6 Sep 2025 14:58:03 +0100 Subject: [PATCH 14/16] Add IPv6 addresses for azure-01 and azure-02 --- src/ipv6.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ipv6.json b/src/ipv6.json index 7e14ea5..c6bec56 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -1,6 +1,8 @@ { "albi": "2001:0bc8:1200:0004:dac4:97ff:fe8a:9cfc", "angor": "2001:43f8:1f4:b00:b283:feff:fed8:dd45", + "azure-01": "2405:a640::156", + "azure-02": "2405:a640::157", "culebre": "2001:4d78:fe03:1c::9", "culebre.he": "2001:470:1:b3b::9", "dribble": "2001:4d78:500:5e3::4", -- 2.39.5 From af7b8f796cafed8d70143b02cd5652e23ee38758 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 10 Sep 2025 10:56:41 +0100 Subject: [PATCH 15/16] Add atproto verification for operations.openstreetmap.org --- src/openstreetmap.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index abba69a..1d4b3d2 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -132,6 +132,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Bluesky domain verification TXT("_atproto", "did=did:plc:i6llv7iwybeipknl57v4dalb"), + TXT("_atproto.operations", "did=did:plc:eikdzxaxo3gjyebugkn6za5w"), // Delegate MTA-STS policy for subdomains -- 2.39.5 From 075d2edec3921d3c2a180306b055b48f1f17c02e Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 23 Sep 2025 18:54:18 +0100 Subject: [PATCH 16/16] Add openstreetmap.se domain --- dnsconfig.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dnsconfig.js b/dnsconfig.js index f825ad3..666c70e 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -170,6 +170,7 @@ OPENSTREETMAP("openstreetmap.me", REG_GANDI); OPENSTREETMAP("openstreetmap.mx", REG_GANDI); OPENSTREETMAP("openstreetmap.pe", REG_GANDI); OPENSTREETMAP("openstreetmap.ph", REG_GANDI); +OPENSTREETMAP("openstreetmap.se", REG_GANDI); // Transfer to OSMF care 23 Sept 2025 OPENSTREETMAP("openstreetmap.sg", REG_GANDI); OPENSTREETMAP("openstreetmap.tv", REG_GANDI); OPENSTREETMAP("openstreetmap.wales", REG_GANDI); -- 2.39.5