From 2da65055a7fb2b52ef6b284653b6fd1899dbc4d2 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 24 Feb 2025 21:52:46 +0000 Subject: [PATCH 01/16] Ensure consistent line endings in IPv4 and IPv6 files --- src/ipv4.json | 88 +++++++++++++++++++++++++-------------------------- src/ipv6.json | 28 ++++++++-------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/ipv4.json b/src/ipv4.json index 0ec091e..c132ac6 100644 --- a/src/ipv4.json +++ b/src/ipv4.json @@ -1,20 +1,20 @@ { "albi": "51.159.53.238", "angor": "196.10.54.165", - "ats1.ams": "10.0.48.103" - "cmok": "64.225.143.127" + "ats1.ams": "10.0.48.103", + "cmok": "64.225.143.127", "culebre": "87.252.214.105", "culebre.he": "184.104.226.105", "culebre.dub": "10.0.64.9", - "culebre.oob": "10.0.65.9" + "culebre.oob": "10.0.65.9", "dribble": "82.199.86.100", "dribble.he": "184.104.179.132", "dribble.ams": "10.0.48.4", - "dribble.oob": "10.0.49.4" + "dribble.oob": "10.0.49.4", "dulcy": "82.199.86.105", "dulcy.he": "184.104.179.137", "dulcy.ams": "10.0.48.9", - "dulcy.oob": "10.0.49.9" + "dulcy.oob": "10.0.49.9", "eddie.ucl": "10.0.0.10", "eddie.oob": "10.0.1.10", "equinix-gw.ams": "82.199.86.73", @@ -28,96 +28,96 @@ "faffy": "82.199.86.99", "faffy.he": "184.104.179.131", "faffy.ams": "10.0.48.3", - "faffy.oob": "10.0.49.3" + "faffy.oob": "10.0.49.3", "fafnir": "87.252.214.98", "fafnir.he": "184.104.226.98", "fafnir.dub": "10.0.64.2", - "fafnir.oob": "10.0.65.2" + "fafnir.oob": "10.0.65.2", "fume": "87.252.214.112", "fume.he": "184.104.226.112", "fume.dub": "10.0.64.16", - "fume.oob": "10.0.65.16" + "fume.oob": "10.0.65.16", "grisu": "87.252.214.113", "grisu.he": "184.104.226.113", "grisu.dub": "10.0.64.17", - "grisu.oob": "10.0.65.17" + "grisu.oob": "10.0.65.17", "horntail": "87.252.214.106", "horntail.he": "184.104.226.106", "horntail.dub": "10.0.64.10", - "horntail.oob": "10.0.65.10" + "horntail.oob": "10.0.65.10", "idris": "87.252.214.102", "idris.he": "184.104.226.102", "idris.dub": "10.0.64.6", - "idris.oob": "10.0.65.6" + "idris.oob": "10.0.65.6", "karm.ams": "10.0.48.50", - "karm.oob": "10.0.49.50" + "karm.oob": "10.0.49.50", "konqi": "87.252.214.103", "konqi.he": "184.104.226.103", "konqi.dub": "10.0.64.7", - "konqi.oob": "10.0.65.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", - "lockheed.oob": "10.0.49.16" + "lockheed.oob": "10.0.49.16", "longma": "87.252.214.109", "longma.he": "184.104.226.109", "longma.dub": "10.0.64.13", - "longma.oob": "10.0.65.13" + "longma.oob": "10.0.65.13", "meraxes": "51.15.185.90", "muirdris": "87.252.214.111", "muirdris.he": "184.104.226.111", "muirdris.dub": "10.0.64.15", - "muirdris.oob": "10.0.65.15" + "muirdris.oob": "10.0.65.15", "naga": "87.252.214.104", "naga.he": "184.104.226.104", "naga.dub": "10.0.64.8", - "naga.oob": "10.0.65.8" - "neak": "89.234.177.142" + "naga.oob": "10.0.65.8", + "neak": "89.234.177.142", "nidhogg": "194.71.11.111", - "nidhogg.oob": "130.239.18.115" + "nidhogg.oob": "130.239.18.115", "norbert": "82.199.86.113", "norbert.he": "184.104.179.145", "norbert.ams": "10.0.48.17", - "norbert.oob": "10.0.49.17" + "norbert.oob": "10.0.49.17", "odin": "82.199.86.111", "odin.he": "184.104.179.143", "odin.ams": "10.0.48.15", - "odin.oob": "10.0.49.15" - "oob1.ams": "10.0.48.102" - "oob1.dub": "10.0.64.102" - "palulukon": "3.144.0.72" + "odin.oob": "10.0.49.15", + "oob1.ams": "10.0.48.102", + "oob1.dub": "10.0.64.102", + "palulukon": "3.144.0.72", "piasa": "140.211.167.101", - "piasa.oob": "10.0.0.198" - "pdu1.ams": "10.0.48.100" - "pdu2.ams": "10.0.48.101" - "pdu1.dub": "10.0.64.100" - "pdu2.dub": "10.0.64.101" + "piasa.oob": "10.0.0.198", + "pdu1.ams": "10.0.48.100", + "pdu2.ams": "10.0.48.101", + "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" + "ridgeback.oob": "31.169.50.14", "ridley": "193.60.236.19", "ridley.ucl": "10.0.0.3", - "ridley.oob": "10.0.1.3" + "ridley.oob": "10.0.1.3", "shenron": "212.110.172.32", "smaug": "87.252.214.110", "smaug.he": "184.104.226.110", "smaug.dub": "10.0.64.14", - "smaug.oob": "10.0.65.14" + "smaug.oob": "10.0.65.14", "snap-01.ams": "10.0.48.49", - "snap-01.oob": "10.0.49.49" + "snap-01.oob": "10.0.49.49", "snap-02.ucl": "10.0.0.4", - "snap-02.oob": "10.0.1.4" + "snap-02.oob": "10.0.1.4", "snap-03.dub": "10.0.64.50", - "snap-03.oob": "10.0.65.50" + "snap-03.oob": "10.0.65.50", "spike-01": "87.252.214.99", "spike-01.he": "184.104.226.99", "spike-01.dub": "10.0.64.3", - "spike-01.oob": "10.0.65.3" + "spike-01.oob": "10.0.65.3", "spike-02": "87.252.214.100", "spike-02.he": "184.104.226.100", "spike-02.dub": "10.0.64.4", - "spike-02.oob": "10.0.65.4" + "spike-02.oob": "10.0.65.4", "spike-03": "87.252.214.101", "spike-03.he": "184.104.226.101", "spike-03.dub": "10.0.64.5", @@ -125,19 +125,19 @@ "spike-06": "82.199.86.102", "spike-06.he": "184.104.179.134", "spike-06.ams": "10.0.48.6", - "spike-06.oob": "10.0.49.6" + "spike-06.oob": "10.0.49.6", "spike-07": "82.199.86.103", "spike-07.he": "184.104.179.135", "spike-07.ams": "10.0.48.7", - "spike-07.oob": "10.0.49.7" + "spike-07.oob": "10.0.49.7", "spike-08": "82.199.86.104", "spike-08.he": "184.104.179.136", "spike-08.ams": "10.0.48.8", - "spike-08.oob": "10.0.49.8" + "spike-08.oob": "10.0.49.8", "stormfly-03": "140.211.167.99", - "stormfly-03.oob": "10.0.0.2" + "stormfly-03.oob": "10.0.0.2", "stormfly-04": "140.211.167.100", - "stormfly-04.oob": "10.0.0.3" + "stormfly-04.oob": "10.0.0.3", "switch1.ams": "82.199.86.97", "switch1.he.ams": "184.104.179.129", "switch1.dub": "87.252.214.97", @@ -145,12 +145,12 @@ "tabaluga": "82.199.86.110", "tabaluga.he": "184.104.179.142", "tabaluga.ams": "10.0.48.14", - "tabaluga.oob": "10.0.49.14" + "tabaluga.oob": "10.0.49.14", "vhagar": "82.199.86.101", "vhagar.he": "184.104.179.133", "vhagar.ams": "10.0.48.5", "vhagar.oob": "10.0.49.5", - "wawel": "64.225.136.96" + "wawel": "64.225.136.96", "ysera": "193.60.236.22", "ysera.ucl": "10.0.0.15", "ysera.oob": "10.0.1.15" diff --git a/src/ipv6.json b/src/ipv6.json index dfe79f8..b345f49 100644 --- a/src/ipv6.json +++ b/src/ipv6.json @@ -7,14 +7,14 @@ "dribble.he": "2001:470:1:fa1::4", "dulcy": "2001:4d78:500:5e3::9", "dulcy.he": "2001:470:1:fa1::9", - "equinix-gw.ams": "2001:4d78:500:5e2::1" - "equinix-gw-1.ams": "2001:4d78:500:5e2::2" + "equinix-gw.ams": "2001:4d78:500:5e2::1", + "equinix-gw-1.ams": "2001:4d78:500:5e2::2", "equinix-gw-2.ams": "2001:4d78:500:5e2::3", - "equinix-osm.ams": "2001:4d78:500:5e2::4" - "equinix-gw.dub": "2001:4d78:fe03:1b::1" - "equinix-gw-1.dub": "2001:4d78:fe03:1b::2" - "equinix-gw-2.dub": "2001:4d78:fe03:1b::3" - "equinix-osm.dub": "2001:4d78:fe03:1b::4" + "equinix-osm.ams": "2001:4d78:500:5e2::4", + "equinix-gw.dub": "2001:4d78:fe03:1b::1", + "equinix-gw-1.dub": "2001:4d78:fe03:1b::2", + "equinix-gw-2.dub": "2001:4d78:fe03:1b::3", + "equinix-osm.dub": "2001:4d78:fe03:1b::4", "faffy": "2001:4d78:500:5e3::3", "faffy.he": "2001:470:1:fa1::3", "fafnir": "2001:4d78:fe03:1c::2", @@ -29,12 +29,12 @@ "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" + "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", "longma.he": "2001:470:1:b3b::d", - "meraxes": "2001:bc8:2d57:100:aa1e:84ff:fe72:e660" + "meraxes": "2001:bc8:2d57:100:aa1e:84ff:fe72:e660", "muirdris": "2001:4d78:fe03:1c::f", "muirdris.he": "2001:470:1:b3b::f", "naga": "2001:4d78:fe03:1c::8", @@ -45,8 +45,8 @@ "odin": "2001:4d78:500:5e3::f", "odin.he": "2001:470:1:fa1::f", "piasa": "2605:bc80:3010:700::8cd3:a765", - "rhaegal": "2001:b68:40ff:3::2" - "shenron": "2001:41c9:1:400::32" + "rhaegal": "2001:b68:40ff:3::2", + "shenron": "2001:41c9:1:400::32", "smaug": "2001:4d78:fe03:1c::e", "smaug.he": "2001:470:1:b3b::e", "spike-01": "2001:4d78:fe03:1c::3", @@ -63,10 +63,10 @@ "spike-08.he": "2001:470:1:fa1::8", "stormfly-03": "2605:bc80:3010:700::8cd3:a763", "stormfly-04": "2605:bc80:3010:700::8cd3:a764", - "switch1.he.ams": "2001:470:1:fa1::1" - "switch1.ams": "2001:4d78:500:5e3::1" + "switch1.he.ams": "2001:470:1:fa1::1", + "switch1.ams": "2001:4d78:500:5e3::1", "switch1.dub": "2001:4d78:fe03:1c::1", - "switch1.he.dub": "2001:470:1:b3b::1" + "switch1.he.dub": "2001:470:1:b3b::1", "tabaluga": "2001:4d78:500:5e3::e", "tabaluga.he": "2001:470:1:fa1::e", "vhagar": "2001:4d78:500:5e3::5", -- 2.39.5 From b6c650cc45be7c2c724b9e099a3067b729863f55 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 24 Feb 2025 19:29:00 +0000 Subject: [PATCH 02/16] Add osm_web_service to normalise OSM web records --- dnsconfig.js | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dnsconfig.js b/dnsconfig.js index 25f32e0..06d230a 100644 --- a/dnsconfig.js +++ b/dnsconfig.js @@ -19,6 +19,104 @@ function loadTemplate(template) { }; } +/** + * Create A, optional AAAA, and optional HTTPS (SVCB) records for an OSM web service, + * with optional Cloudflare proxy support. + * + * @param {string} name - Hostname (e.g. "www"). + * @param {string[]} servers - Required array of servers. + * @param {Object} [options] - Optional settings for HTTPS and Cloudflare. + * @param {boolean} [options.h1=false] - If true, sets HTTPS apn=http1.1 + * @param {boolean} [options.h2=true] - If true, sets HTTPS apn=h2 + * @param {boolean} [options.h3=false] - If true, sets HTTPS apn=h3 + * @param {boolean} [options.cfproxy=false] - If true, enables Cloudflare proxy on A/AAAA. + * + */ +function osm_web_service( + name, + servers, + options +) { + + // If servers is a string, convert to a single-element array + if (typeof servers === "string") { + servers = [servers]; + } + + if (options === undefined) { + options = {}; + } + + // Set default values for options.h1, options.h2, and options.h3 + options.h1 = options.h1 !== undefined ? options.h1 : false; + options.h2 = options.h2 !== undefined ? options.h2 : true; + options.h3 = options.h3 !== undefined ? options.h3 : false; + + var records = []; + var ipv4s = []; + var ipv6s = []; + + servers.forEach(function(serverName) { + if (IPV4[serverName]) { + ipv4s.push(IPV4[serverName]); + if (!options.cfproxy) { + records.push(A(name, IPV4[serverName])); + } else { + records.push(A(name, IPV4[serverName], CF_PROXY_ON)); + } + } + if (IPV6[serverName]) { + ipv6s.push(IPV6[serverName]); + if (!options.cfproxy) { + records.push(AAAA(name, IPV6[serverName])); + } else { + records.push(AAAA(name, IPV6[serverName], CF_PROXY_ON)); + } + } + }); + + if (ipv4s.length === 0 && ipv6s.length === 0) { + throw new Error("An IPv4 or IPv6 address is required for " + name + " service"); + } + + // + // Build a parameter string for DNSControl HTTPS() syntax. + // Example: "ipv4hint=1.2.3.4,1.2.3.5 ipv6hint=2001:db8::1,2001:db8::2 alpn=h2" + // + var paramParts = []; + if (ipv4s.length > 0) { + // Join IPv4 addresses with comma+space + paramParts.push("ipv4hint=" + ipv4s.join(",")); + } + if (ipv6s.length > 0) { + // Join IPv6 addresses with comma+space + paramParts.push("ipv6hint=" + ipv6s.join(",")); + } + + if (options.h1 || options.h2 || options.h3) { + var paramPartsALPN = []; + if (options.h3) { + paramPartsALPN.push("h3"); + } + if (options.h2) { + paramPartsALPN.push("h2"); + } + if (options.h1) { + paramPartsALPN.push("http/1.1"); + } + paramParts.push("alpn=" + paramPartsALPN.join(",")); + } + + // Join the parts with a space + var paramString = paramParts.join(" "); + + // Create the HTTPS record with 4 arguments + records.push(HTTPS(name, 1, ".", paramString)); + + + return records; +} + // Ensure that the reverse DNS records are in RFC 4183 notation REVCOMPAT("rfc4183"); -- 2.39.5 From d962baf34a5d0581f5d487c20f3a4efd21fa8121 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 24 Feb 2025 21:51:45 +0000 Subject: [PATCH 03/16] Use osm_web_service for openstreetmap.org --- src/openstreetmap.js | 410 +++++++++++-------------------------------- 1 file changed, 107 insertions(+), 303 deletions(-) diff --git a/src/openstreetmap.js b/src/openstreetmap.js index bae9c42..dc5d257 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -148,76 +148,30 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web servers and their aliases - HTTPS("www", 1, ".", "alpn=h2"), - HTTPS("api", 1, ".", "alpn=h2"), - HTTPS("maps", 1, ".", "alpn=h2"), - HTTPS("mapz", 1, ".", "alpn=h2"), - - // A("@", IPV4["spike-01.he"]), - // AAAA("@", IPV6["spike-01.he"]), - // A("www", IPV4["spike-01.he"]), - // AAAA("www", IPV6["spike-01.he"]), - // A("api", IPV4["spike-01.he"]), - // AAAA("api", IPV6["spike-01.he"]), - // A("maps", IPV4["spike-01.he"]), - // AAAA("maps", IPV6["spike-01.he"]), - // A("mapz", IPV4["spike-01.he"]), - // AAAA("mapz", IPV6["spike-01.he"]), - - // A("@", IPV4["spike-02.he"]), - // AAAA("@", IPV6["spike-02.he"]), - // A("www", IPV4["spike-02.he"]), - // AAAA("www", IPV6["spike-02.he"]), - // A("api", IPV4["spike-02.he"]), - // AAAA("api", IPV6["spike-02.he"]), - // A("maps", IPV4["spike-02.he"]), - // AAAA("maps", IPV6["spike-02.he"]), - // A("mapz", IPV4["spike-02.he"]), - // AAAA("mapz", IPV6["spike-02.he"]), - - // A("@", IPV4["spike-03.he"]), - // AAAA("@", IPV6["spike-03.he"]), - // A("www", IPV4["spike-03.he"]), - // AAAA("www", IPV6["spike-03.he"]), - // A("api", IPV4["spike-03.he"]), - // AAAA("api", IPV6["spike-03.he"]), - // A("maps", IPV4["spike-03.he"]), - // AAAA("maps", IPV6["spike-03.he"]), - // A("mapz", IPV4["spike-03.he"]), - // AAAA("mapz", IPV6["spike-03.he"]), - - A("@", IPV4["spike-06"], CF_PROXY_ON), - AAAA("@", IPV6["spike-06"], CF_PROXY_ON), - A("www", IPV4["spike-06"], CF_PROXY_ON), - AAAA("www", IPV6["spike-06"], CF_PROXY_ON), - A("api", IPV4["spike-06"], CF_PROXY_ON), - AAAA("api", IPV6["spike-06"], CF_PROXY_ON), - A("maps", IPV4["spike-06"], CF_PROXY_ON), - AAAA("maps", IPV6["spike-06"], CF_PROXY_ON), - A("mapz", IPV4["spike-06"], CF_PROXY_ON), - AAAA("mapz", IPV6["spike-06"], CF_PROXY_ON), - - A("@", IPV4["spike-07"], CF_PROXY_ON), - AAAA("@", IPV6["spike-07"], CF_PROXY_ON), - A("www", IPV4["spike-07"], CF_PROXY_ON), - AAAA("www", IPV6["spike-07"], CF_PROXY_ON), - A("api", IPV4["spike-07"], CF_PROXY_ON), - AAAA("api", IPV6["spike-07"], CF_PROXY_ON), - A("maps", IPV4["spike-07"], CF_PROXY_ON), - AAAA("maps", IPV6["spike-07"], CF_PROXY_ON), - A("mapz", IPV4["spike-07"], CF_PROXY_ON), - AAAA("mapz", IPV6["spike-07"], CF_PROXY_ON), - - A("@", IPV4["spike-08"], CF_PROXY_ON), - AAAA("@", IPV6["spike-08"], CF_PROXY_ON), - A("www", IPV4["spike-08"], CF_PROXY_ON), - AAAA("www", IPV6["spike-08"], CF_PROXY_ON), - A("api", IPV4["spike-08"], CF_PROXY_ON), - AAAA("api", IPV6["spike-08"], CF_PROXY_ON), - A("maps", IPV4["spike-08"], CF_PROXY_ON), - AAAA("maps", IPV6["spike-08"], CF_PROXY_ON), - A("mapz", IPV4["spike-08"], CF_PROXY_ON), - AAAA("mapz", IPV6["spike-08"], CF_PROXY_ON), + osm_web_service("@", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), + + osm_web_service("www", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), + + osm_web_service("api", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), + + osm_web_service("maps", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), + + osm_web_service("mapz", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), // Nominatim servers @@ -232,10 +186,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("b.tile", "dualstack.n.sni.global.fastly.net."), CNAME("c.tile", "dualstack.n.sni.global.fastly.net."), - A("render", IPV4["culebre.he"]), - A("render", IPV4["nidhogg"]), - AAAA("render", IPV6["culebre.he"]), - AAAA("render", IPV6["nidhogg"]), + osm_web_service("render", [ "culebre.he", + "nidhogg" + ]), // Vector tile servers @@ -243,285 +196,136 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Planet servers - HTTPS("planet", 1, ".", "alpn=h2"), - A("backup", IPV4["norbert"]), AAAA("backup", IPV6["norbert"]), - A("planet", IPV4["norbert"]), - AAAA("planet", IPV6["norbert"]), - // A("backup", IPV4["horntail.he"]), // AAAA("backup", IPV6["horntail.he"]), - // A("planet", IPV4["horntail.he"]), - // AAAA("planet", IPV6["horntail.he"]), + + osm_web_service("planet", "norbert"), + // osm_web_service("planet", "horntail.he"), // Development server with wildcard alias for user sites - A("dev", IPV4["faffy"]), - AAAA("dev", IPV6["faffy"]), - A("*.dev", IPV4["faffy"]), - AAAA("*.dev", IPV6["faffy"]), - A("ooc", IPV4["faffy"]), - AAAA("ooc", IPV6["faffy"]), - A("a.ooc", IPV4["faffy"]), - AAAA("a.ooc", IPV6["faffy"]), - A("b.ooc", IPV4["faffy"]), - AAAA("b.ooc", IPV6["faffy"]), - A("c.ooc", IPV4["faffy"]), - AAAA("c.ooc", IPV6["faffy"]), - A("npe", IPV4["faffy"]), - AAAA("npe", IPV6["faffy"]), + osm_web_service("dev", "faffy"), + osm_web_service("*.dev", "faffy"), + osm_web_service("ooc", "faffy"), + osm_web_service("a.ooc", "faffy"), + osm_web_service("b.ooc", "faffy"), + osm_web_service("c.ooc", "faffy"), + osm_web_service("npe", "faffy"), // Foundation server - HTTPS("blog", 1, ".", "alpn=h2"), - HTTPS("foundation", 1, ".", "alpn=h2"), - - A("blog", IPV4["ridley"]), - A("foundation", IPV4["ridley"]), + osm_web_service("blog", "ridley"), + osm_web_service("foundation", "ridley"), // Matomo server - HTTPS("matomo", 1, ".", "alpn=h2"), - HTTPS("piwik", 1, ".", "alpn=h2"), - - A("matomo", IPV4["smaug.he"]), - AAAA("matomo", IPV6["smaug.he"]), - A("piwik", IPV4["smaug.he"]), - AAAA("piwik", IPV6["smaug.he"]), + osm_web_service("matomo", "smaug.he"), + osm_web_service("piwik", "smaug.he"), // Imagery servers - HTTPS("agri", 1, ".", "alpn=h2"), - HTTPS("a.agri", 1, ".", "alpn=h2"), - HTTPS("b.agri", 1, ".", "alpn=h2"), - HTTPS("c.agri", 1, ".", "alpn=h2"), - - A("agri", IPV4["lockheed"]), - AAAA("agri", IPV6["lockheed"]), - A("a.agri", IPV4["lockheed"]), - AAAA("a.agri", IPV6["lockheed"]), - A("b.agri", IPV4["lockheed"]), - AAAA("b.agri", IPV6["lockheed"]), - A("c.agri", IPV4["lockheed"]), - AAAA("c.agri", IPV6["lockheed"]), - - HTTPS("act-imagery", 1, ".", "alpn=h2"), - HTTPS("a.act-imagery", 1, ".", "alpn=h2"), - HTTPS("b.act-imagery", 1, ".", "alpn=h2"), - HTTPS("c.act-imagery", 1, ".", "alpn=h2"), - - A("act-imagery", IPV4["lockheed"]), - AAAA("act-imagery", IPV6["lockheed"]), - A("a.act-imagery", IPV4["lockheed"]), - AAAA("a.act-imagery", IPV6["lockheed"]), - A("b.act-imagery", IPV4["lockheed"]), - AAAA("b.act-imagery", IPV6["lockheed"]), - A("c.act-imagery", IPV4["lockheed"]), - AAAA("c.act-imagery", IPV6["lockheed"]), - - HTTPS("au-vic-melbourne-imagery", 1, ".", "alpn=h2"), - HTTPS("a.au-vic-melbourne-imagery", 1, ".", "alpn=h2"), - HTTPS("b.au-vic-melbourne-imagery", 1, ".", "alpn=h2"), - HTTPS("c.au-vic-melbourne-imagery", 1, ".", "alpn=h2"), - - A("au-vic-melbourne-imagery", IPV4["lockheed"]), - AAAA("au-vic-melbourne-imagery", IPV6["lockheed"]), - A("a.au-vic-melbourne-imagery", IPV4["lockheed"]), - AAAA("a.au-vic-melbourne-imagery", IPV6["lockheed"]), - A("b.au-vic-melbourne-imagery", IPV4["lockheed"]), - AAAA("b.au-vic-melbourne-imagery", IPV6["lockheed"]), - A("c.au-vic-melbourne-imagery", IPV4["lockheed"]), - AAAA("c.au-vic-melbourne-imagery", IPV6["lockheed"]), - - HTTPS("os", 1, ".", "alpn=h2"), - HTTPS("a.os", 1, ".", "alpn=h2"), - HTTPS("b.os", 1, ".", "alpn=h2"), - HTTPS("c.os", 1, ".", "alpn=h2"), - - A("os", IPV4["lockheed"]), - AAAA("os", IPV6["lockheed"]), - A("a.os", IPV4["lockheed"]), - AAAA("a.os", IPV6["lockheed"]), - A("b.os", IPV4["lockheed"]), - AAAA("b.os", IPV6["lockheed"]), - A("c.os", IPV4["lockheed"]), - AAAA("c.os", IPV6["lockheed"]), - - HTTPS("tiler", 1, ".", "alpn=h2"), - HTTPS("us-imagery", 1, ".", "alpn=h2"), - HTTPS("a.us-imagery", 1, ".", "alpn=h2"), - HTTPS("b.us-imagery", 1, ".", "alpn=h2"), - HTTPS("c.us-imagery", 1, ".", "alpn=h2"), - - A("tiler", IPV4["lockheed"]), - AAAA("tiler", IPV6["lockheed"]), - A("us-imagery", IPV4["lockheed"]), - AAAA("us-imagery", IPV6["lockheed"]), - A("a.us-imagery", IPV4["lockheed"]), - AAAA("a.us-imagery", IPV6["lockheed"]), - A("b.us-imagery", IPV4["lockheed"]), - AAAA("b.us-imagery", IPV6["lockheed"]), - A("c.us-imagery", IPV4["lockheed"]), - AAAA("c.us-imagery", IPV6["lockheed"]), + osm_web_service("agri", "lockheed"), + osm_web_service("a.agri", "lockheed"), + osm_web_service("b.agri", "lockheed"), + osm_web_service("c.agri", "lockheed"), - // Prometheus server and munin redirect + osm_web_service("act-imagery", "lockheed"), + osm_web_service("a.act-imagery", "lockheed"), + osm_web_service("b.act-imagery", "lockheed"), + osm_web_service("c.act-imagery", "lockheed"), + + osm_web_service("au-vic-melbourne-imagery", "lockheed"), + osm_web_service("a.au-vic-melbourne-imagery", "lockheed"), + osm_web_service("b.au-vic-melbourne-imagery", "lockheed"), + osm_web_service("c.au-vic-melbourne-imagery", "lockheed"), + + osm_web_service("os", "lockheed"), + osm_web_service("a.os", "lockheed"), + osm_web_service("b.os", "lockheed"), + osm_web_service("c.os", "lockheed"), - HTTPS("prometheus", 1, ".", "alpn=h2"), - HTTPS("munin", 1, ".", "alpn=h2"), + osm_web_service("tiler", "lockheed"), - A("prometheus", IPV4["stormfly-03"]), - AAAA("prometheus", IPV6["stormfly-03"]), - A("munin", IPV4["stormfly-03"]), - AAAA("munin", IPV6["stormfly-03"]), + osm_web_service("us-imagery", "lockheed"), + osm_web_service("a.us-imagery", "lockheed"), + osm_web_service("b.us-imagery", "lockheed"), + osm_web_service("c.us-imagery", "lockheed"), + + // Prometheus server and munin redirect + + osm_web_service("prometheus", "stormfly-03"), + osm_web_service("munin", "stormfly-03"), // Management server - HTTPS("acme", 1, ".", "alpn=h2"), - HTTPS("chef", 1, ".", "alpn=h2"), - HTTPS("dns", 1, ".", "alpn=h2"), - HTTPS("git", 1, ".", "alpn=h2"), - HTTPS("hardware", 1, ".", "alpn=h2"), - - A("acme", IPV4["idris.he"]), - AAAA("acme", IPV6["idris.he"]), - A("apt", IPV4["idris.he"]), - AAAA("apt", IPV6["idris.he"]), - A("chef", IPV4["idris.he"]), - AAAA("chef", IPV6["idris.he"]), - A("dns", IPV4["idris.he"]), - AAAA("dns", IPV6["idris.he"]), - A("git", IPV4["idris.he"]), - AAAA("git", IPV6["idris.he"]), - A("hardware", IPV4["idris.he"]), - AAAA("hardware", IPV6["idris.he"]), + 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"), // Bytemark machine, and the services which operate from it - HTTPS("lists", 1, ".", "alpn=h2"), - HTTPS("help", 1, ".", "alpn=h2"), - - A("lists", IPV4["shenron"]), - AAAA("lists", IPV6["shenron"]), - A("help", IPV4["shenron"]), - AAAA("help", IPV6["shenron"]), + osm_web_service("lists", "shenron"), + osm_web_service("help", "shenron"), // Naga services - HTTPS("svn", 1, ".", "alpn=h2"), - HTTPS("trac", 1, ".", "alpn=h2"), - HTTPS("irc", 1, ".", "alpn=h2"), - HTTPS("blogs", 1, ".", "alpn=h2"), - HTTPS("welcome", 1, ".", "alpn=h2"), - HTTPS("operations", 1, ".", "alpn=h2"), - HTTPS("hot", 1, ".", "alpn=h2"), - HTTPS("dmca", 1, ".", "alpn=h2"), - // HTTPS("otrs", 1, ".", "alpn=h2"), - OTRS is not available using HTTPS/2 - HTTPS("birthday20", 1, ".", "alpn=h2"), - - A("svn", IPV4["naga.he"]), - AAAA("svn", IPV6["naga.he"]), - A("trac", IPV4["naga.he"]), - AAAA("trac", IPV6["naga.he"]), - A("irc", IPV4["naga.he"]), - AAAA("irc", IPV6["naga.he"]), - A("blogs", IPV4["naga.he"]), - AAAA("blogs", IPV6["naga.he"]), - A("welcome", IPV4["naga.he"]), - AAAA("welcome", IPV6["naga.he"]), - A("operations", IPV4["naga.he"]), - AAAA("operations", IPV6["naga.he"]), - A("hot", IPV4["naga.he"]), - AAAA("hot", IPV6["naga.he"]), - A("dmca", IPV4["naga.he"]), - AAAA("dmca", IPV6["naga.he"]), - A("otrs", IPV4["naga.he"]), - AAAA("otrs", IPV6["naga.he"]), - A("birthday20", IPV4["naga.he"]), - AAAA("birthday20", IPV6["naga.he"]), + 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"), // Wiki servers - HTTPS("wiki", 1, ".", "alpn=h2"), - - A("wiki", IPV4["konqi.he"]), - AAAA("wiki", IPV6["konqi.he"]), + osm_web_service("wiki", "konqi.he"), // Overpass server - HTTPS("query", 1, ".", "alpn=h2"), - - A("query", IPV4["grisu.he"]), - AAAA("query", IPV6["grisu.he"]), + osm_web_service("query", "grisu.he"), // GPS tile server - HTTPS("gps-tile", 1, ".", "alpn=h2"), - HTTPS("a.gps-tile", 1, ".", "alpn=h2"), - HTTPS("b.gps-tile", 1, ".", "alpn=h2"), - HTTPS("c.gps-tile", 1, ".", "alpn=h2"), - HTTPS("gps-a.tile", 1, ".", "alpn=h2"), - HTTPS("gps-b.tile", 1, ".", "alpn=h2"), - HTTPS("gps-c.tile", 1, ".", "alpn=h2"), - - A("gps-tile", IPV4["muirdris.he"]), - AAAA("gps-tile", IPV6["muirdris.he"]), - A("a.gps-tile", IPV4["muirdris.he"]), - AAAA("a.gps-tile", IPV6["muirdris.he"]), - A("b.gps-tile", IPV4["muirdris.he"]), - AAAA("b.gps-tile", IPV6["muirdris.he"]), - A("c.gps-tile", IPV4["muirdris.he"]), - AAAA("c.gps-tile", IPV6["muirdris.he"]), - A("gps.tile", IPV4["muirdris.he"]), - AAAA("gps.tile", IPV6["muirdris.he"]), - A("gps-a.tile", IPV4["muirdris.he"]), - AAAA("gps-a.tile", IPV6["muirdris.he"]), - A("gps-b.tile", IPV4["muirdris.he"]), - AAAA("gps-b.tile", IPV6["muirdris.he"]), - A("gps-c.tile", IPV4["muirdris.he"]), - AAAA("gps-c.tile", IPV6["muirdris.he"]), + 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"), // Donation site and new OSMF crm site - HTTPS("donate", 1, ".", "alpn=h2"), - HTTPS("support", 1, ".", "alpn=h2"), - HTTPS("supporting", 1, ".", "alpn=h2"), - - A("donate", IPV4["ridley"]), - A("support", IPV4["ridley"]), - A("supporting", IPV4["ridley"]), + osm_web_service("donate", "ridley"), + osm_web_service("support", "ridley"), + osm_web_service("supporting", "ridley"), // Discourse server ("community") - HTTPS("community", 1, ".", "alpn=h2"), - HTTPS("communities", 1, ".", "alpn=h2"), - HTTPS("c", 1, ".", "alpn=h2"), - - A("community", IPV4["fume.he"]), - A("communities", IPV4["fume.he"]), - A("c", IPV4["fume.he"]), - AAAA("community", IPV6["fume.he"]), - AAAA("communities", IPV6["fume.he"]), - AAAA("c", IPV6["fume.he"]), + osm_web_service("community", "fume.he"), + osm_web_service("communities", "fume.he"), + osm_web_service("c", "fume.he"), + osm_web_service("forum", "fume.he"), CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"), - HTTPS("forum", 1, ".", "alpn=h2"), - - A("forum", IPV4["fume.he"]), - AAAA("forum", IPV6["fume.he"]), - // Taginfo and Staging Blog Server - HTTPS("taginfo", 1, ".", "alpn=h2"), - - A("taginfo", IPV4["tabaluga"]), - AAAA("taginfo", IPV6["tabaluga"]), + osm_web_service("taginfo", "tabaluga"), - HTTPS("staging.blog", 1, ".", "alpn=h2"), + // Staging Blog Server - A("staging.blog", IPV4["tabaluga"]), - AAAA("staging.blog", IPV6["tabaluga"]) + osm_web_service("staging.blog", "tabaluga"), ); -- 2.39.5 From a1d4e59a1962ab49b2da171ceb10624467966ea2 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 24 Feb 2025 23:21:00 +0000 Subject: [PATCH 04/16] Use osm_web_service for all domains --- src/opengeodata.js | 6 +-- src/openstreetmap-town.js | 3 +- src/openstreetmap-uk.js | 54 ++++++++--------------- src/openstreetmap-za.js | 78 ++++++++------------------------- src/openstreetmap.js | 92 ++++++++++++++++++++------------------- src/osm-wiki.js | 9 ++-- src/osmfoundation.js | 52 +++++++--------------- src/stateofthemap-eu.js | 6 +-- src/stateofthemap.js | 71 ++++++++---------------------- src/switch2osm.js | 10 +---- 10 files changed, 130 insertions(+), 251 deletions(-) diff --git a/src/opengeodata.js b/src/opengeodata.js index 807df1f..738c7d2 100644 --- a/src/opengeodata.js +++ b/src/opengeodata.js @@ -26,8 +26,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", IPV4["ridley"]), - A("old", IPV4["ridley"]), // Legacy URL support https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/ - A("www", IPV4["ridley"]) + 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") ); diff --git a/src/openstreetmap-town.js b/src/openstreetmap-town.js index e3e0076..ccc02ba 100644 --- a/src/openstreetmap-town.js +++ b/src/openstreetmap-town.js @@ -34,7 +34,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Redirect en.openstreetmap.town to en.osm.town - A("en", IPV4["naga.he"]), - AAAA("en", IPV6["naga.he"]) + osm_web_service("en", "naga.he") ); diff --git a/src/openstreetmap-uk.js b/src/openstreetmap-uk.js index bf5d97f..db62c6a 100644 --- a/src/openstreetmap-uk.js +++ b/src/openstreetmap-uk.js @@ -44,40 +44,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Aerial imagery sites - A("hampshire.aerial", IPV4["lockheed"]), - AAAA("hampshire.aerial", IPV6["lockheed"]), - A("a.hampshire.aerial", IPV4["lockheed"]), - AAAA("a.hampshire.aerial", IPV6["lockheed"]), - A("b.hampshire.aerial", IPV4["lockheed"]), - AAAA("b.hampshire.aerial", IPV6["lockheed"]), - A("c.hampshire.aerial", IPV4["lockheed"]), - AAAA("c.hampshire.aerial", IPV6["lockheed"]), - - A("surrey.aerial", IPV4["lockheed"]), - AAAA("surrey.aerial", IPV6["lockheed"]), - A("a.surrey.aerial", IPV4["lockheed"]), - AAAA("a.surrey.aerial", IPV6["lockheed"]), - A("b.surrey.aerial", IPV4["lockheed"]), - AAAA("b.surrey.aerial", IPV6["lockheed"]), - A("c.surrey.aerial", IPV4["lockheed"]), - AAAA("c.surrey.aerial", IPV6["lockheed"]), - - A("os", IPV4["lockheed"]), - AAAA("os", IPV6["lockheed"]), - A("a.os", IPV4["lockheed"]), - AAAA("a.os", IPV6["lockheed"]), - A("b.os", IPV4["lockheed"]), - AAAA("b.os", IPV6["lockheed"]), - A("c.os", IPV4["lockheed"]), - AAAA("c.os", IPV6["lockheed"]), - - A("ea", IPV4["lockheed"]), - AAAA("ea", IPV6["lockheed"]), - A("a.ea", IPV4["lockheed"]), - AAAA("a.ea", IPV6["lockheed"]), - A("b.ea", IPV4["lockheed"]), - AAAA("b.ea", IPV6["lockheed"]), - A("c.ea", IPV4["lockheed"]), - AAAA("c.ea", IPV6["lockheed"]) + osm_web_service("hampshire.aerial", "lockheed"), + osm_web_service("a.hampshire.aerial", "lockheed"), + osm_web_service("b.hampshire.aerial", "lockheed"), + osm_web_service("c.hampshire.aerial", "lockheed"), + + osm_web_service("surrey.aerial", "lockheed"), + osm_web_service("a.surrey.aerial", "lockheed"), + osm_web_service("b.surrey.aerial", "lockheed"), + osm_web_service("c.surrey.aerial", "lockheed"), + + osm_web_service("os", "lockheed"), + osm_web_service("a.os", "lockheed"), + osm_web_service("b.os", "lockheed"), + osm_web_service("c.os", "lockheed"), + + osm_web_service("ea", "lockheed"), + osm_web_service("a.ea", "lockheed"), + osm_web_service("b.ea", "lockheed"), + osm_web_service("c.ea", "lockheed") ); diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js index cd4a20e..1167f28 100644 --- a/src/openstreetmap-za.js +++ b/src/openstreetmap-za.js @@ -40,64 +40,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Aerial imagery sites - A("aerial", IPV4["lockheed"]), - AAAA("aerial", IPV6["lockheed"]), - A("a.aerial", IPV4["lockheed"]), - AAAA("a.aerial", IPV6["lockheed"]), - A("b.aerial", IPV4["lockheed"]), - AAAA("b.aerial", IPV6["lockheed"]), - A("c.aerial", IPV4["lockheed"]), - AAAA("c.aerial", IPV6["lockheed"]), - - // HTTPS / SVCB records - HTTPS("aerial", 1, ".", "alpn=h2"), - HTTPS("a.aerial", 1, ".", "alpn=h2"), - HTTPS("b.aerial", 1, ".", "alpn=h2"), - HTTPS("c.aerial", 1, ".", "alpn=h2"), - - A("coct.aerial", IPV4["lockheed"]), - AAAA("coct.aerial", IPV6["lockheed"]), - A("a.coct.aerial", IPV4["lockheed"]), - AAAA("a.coct.aerial", IPV6["lockheed"]), - A("b.coct.aerial", IPV4["lockheed"]), - AAAA("b.coct.aerial", IPV6["lockheed"]), - A("c.coct.aerial", IPV4["lockheed"]), - AAAA("c.coct.aerial", IPV6["lockheed"]), - - // HTTPS / SVCB records - HTTPS("coct.aerial", 1, ".", "alpn=h2"), - HTTPS("a.coct.aerial", 1, ".", "alpn=h2"), - HTTPS("b.coct.aerial", 1, ".", "alpn=h2"), - HTTPS("c.coct.aerial", 1, ".", "alpn=h2"), - - A("topo", IPV4["lockheed"]), - AAAA("topo", IPV6["lockheed"]), - A("a.topo", IPV4["lockheed"]), - AAAA("a.topo", IPV6["lockheed"]), - A("b.topo", IPV4["lockheed"]), - AAAA("b.topo", IPV6["lockheed"]), - A("c.topo", IPV4["lockheed"]), - AAAA("c.topo", IPV6["lockheed"]), - - // HTTPS / SVCB records - HTTPS("topo", 1, ".", "alpn=h2"), - HTTPS("a.topo", 1, ".", "alpn=h2"), - HTTPS("b.topo", 1, ".", "alpn=h2"), - HTTPS("c.topo", 1, ".", "alpn=h2"), - - A("namibia-topo", IPV4["lockheed"]), - AAAA("namibia-topo", IPV6["lockheed"]), - A("a.namibia-topo", IPV4["lockheed"]), - AAAA("a.namibia-topo", IPV6["lockheed"]), - A("b.namibia-topo", IPV4["lockheed"]), - AAAA("b.namibia-topo", IPV6["lockheed"]), - A("c.namibia-topo", IPV4["lockheed"]), - AAAA("c.namibia-topo", IPV6["lockheed"]), - - // HTTPS / SVCB records - HTTPS("namibia-topo", 1, ".", "alpn=h2"), - HTTPS("a.namibia-topo", 1, ".", "alpn=h2"), - HTTPS("b.namibia-topo", 1, ".", "alpn=h2"), - HTTPS("c.namibia-topo", 1, ".", "alpn=h2") + osm_web_service("aerial", "lockheed"), + osm_web_service("a.aerial", "lockheed"), + osm_web_service("b.aerial", "lockheed"), + osm_web_service("c.aerial", "lockheed"), + + osm_web_service("coct.aerial", "lockheed"), + osm_web_service("a.coct.aerial", "lockheed"), + osm_web_service("b.coct.aerial", "lockheed"), + osm_web_service("c.coct.aerial", "lockheed"), + + osm_web_service("topo", "lockheed"), + osm_web_service("a.topo", "lockheed"), + osm_web_service("b.topo", "lockheed"), + osm_web_service("c.topo", "lockheed"), + + 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") ); diff --git a/src/openstreetmap.js b/src/openstreetmap.js index dc5d257..b78a5a1 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -148,20 +148,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web servers and their aliases - osm_web_service("@", [ "spike-06", - "spike-07", - "spike-08" - ], { cfproxy: true }), + osm_web_service("@", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), - osm_web_service("www", [ "spike-06", - "spike-07", - "spike-08" - ], { cfproxy: true }), + osm_web_service("www", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), - osm_web_service("api", [ "spike-06", - "spike-07", - "spike-08" - ], { cfproxy: true }), + osm_web_service("api", [ "spike-06", + "spike-07", + "spike-08" + ], { cfproxy: true }), osm_web_service("maps", [ "spike-06", "spike-07", @@ -170,7 +170,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), osm_web_service("mapz", [ "spike-06", "spike-07", - "spike-08" + "spike-08" ], { cfproxy: true }), // Nominatim servers @@ -206,49 +206,51 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Development server with wildcard alias for user sites - osm_web_service("dev", "faffy"), + osm_web_service("dev", "faffy"), osm_web_service("*.dev", "faffy"), - osm_web_service("ooc", "faffy"), + + osm_web_service("ooc", "faffy"), osm_web_service("a.ooc", "faffy"), osm_web_service("b.ooc", "faffy"), osm_web_service("c.ooc", "faffy"), - osm_web_service("npe", "faffy"), + + osm_web_service("npe", "faffy"), // Foundation server - osm_web_service("blog", "ridley"), + osm_web_service("blog", "ridley"), osm_web_service("foundation", "ridley"), // Matomo server osm_web_service("matomo", "smaug.he"), - osm_web_service("piwik", "smaug.he"), + osm_web_service("piwik", "smaug.he"), // Imagery servers - osm_web_service("agri", "lockheed"), + osm_web_service("agri", "lockheed"), osm_web_service("a.agri", "lockheed"), osm_web_service("b.agri", "lockheed"), osm_web_service("c.agri", "lockheed"), - osm_web_service("act-imagery", "lockheed"), + osm_web_service("act-imagery", "lockheed"), osm_web_service("a.act-imagery", "lockheed"), osm_web_service("b.act-imagery", "lockheed"), osm_web_service("c.act-imagery", "lockheed"), - osm_web_service("au-vic-melbourne-imagery", "lockheed"), + osm_web_service("au-vic-melbourne-imagery", "lockheed"), osm_web_service("a.au-vic-melbourne-imagery", "lockheed"), osm_web_service("b.au-vic-melbourne-imagery", "lockheed"), osm_web_service("c.au-vic-melbourne-imagery", "lockheed"), - osm_web_service("os", "lockheed"), + osm_web_service("os", "lockheed"), osm_web_service("a.os", "lockheed"), osm_web_service("b.os", "lockheed"), osm_web_service("c.os", "lockheed"), osm_web_service("tiler", "lockheed"), - osm_web_service("us-imagery", "lockheed"), + osm_web_service("us-imagery", "lockheed"), osm_web_service("a.us-imagery", "lockheed"), osm_web_service("b.us-imagery", "lockheed"), osm_web_service("c.us-imagery", "lockheed"), @@ -256,33 +258,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Prometheus server and munin redirect osm_web_service("prometheus", "stormfly-03"), - osm_web_service("munin", "stormfly-03"), + osm_web_service("munin", "stormfly-03"), // 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("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"), // Bytemark machine, and the services which operate from it osm_web_service("lists", "shenron"), - osm_web_service("help", "shenron"), + osm_web_service("help", "shenron"), // 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("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("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"), // Wiki servers @@ -295,27 +297,27 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // GPS tile server - osm_web_service("gps-tile", "muirdris.he"), + 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.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"), // Donation site and new OSMF crm site - osm_web_service("donate", "ridley"), - osm_web_service("support", "ridley"), + osm_web_service("donate", "ridley"), + osm_web_service("support", "ridley"), osm_web_service("supporting", "ridley"), // Discourse server ("community") - osm_web_service("community", "fume.he"), + 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("c", "fume.he"), + osm_web_service("forum", "fume.he"), 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 b7aaf1f..899fc36 100644 --- a/src/osm-wiki.js +++ b/src/osm-wiki.js @@ -58,11 +58,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"), TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"), - A("wiki", IPV4["konqi.he"]), - AAAA("wiki", IPV6["konqi.he"]), - A("www", IPV4["konqi.he"]), - AAAA("www", IPV6["konqi.he"]), - A("@", IPV4["konqi.he"]), - AAAA("@", IPV6["konqi.he"]) + osm_web_service("wiki", "konqi.he"), + osm_web_service("www", "konqi.he"), + osm_web_service("@", "konqi.he") ); diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 642e584..0ad8995 100644 --- a/src/osmfoundation.js +++ b/src/osmfoundation.js @@ -91,49 +91,27 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", IPV4["ridley"]), - A("www", IPV4["ridley"]), - A("wiki", IPV4["ridley"]), - A("blog", IPV4["ridley"]), - A("crm", IPV4["ridley"]), - A("join", IPV4["ridley"]), - A("support", IPV4["ridley"]), - A("supporting", IPV4["ridley"]), - A("donate", IPV4["ridley"]), - - A("board", IPV4["ridley"]), - A("dwg", IPV4["ridley"]), - A("mwg", IPV4["ridley"]), - A("operations", IPV4["naga.he"]), - AAAA("operations", IPV6["naga.he"]), - - // HTTPS / SVCB records - HTTPS("www", 1, ".", "alpn=h2"), - HTTPS("wiki", 1, ".", "alpn=h2"), - HTTPS("blog", 1, ".", "alpn=h2"), - HTTPS("crm", 1, ".", "alpn=h2"), - HTTPS("join", 1, ".", "alpn=h2"), - HTTPS("support", 1, ".", "alpn=h2"), - HTTPS("supporting", 1, ".", "alpn=h2"), - HTTPS("donate", 1, ".", "alpn=h2"), - HTTPS("board", 1, ".", "alpn=h2"), - HTTPS("dwg", 1, ".", "alpn=h2"), - HTTPS("mwg", 1, ".", "alpn=h2"), - HTTPS("operations", 1, ".", "alpn=h2"), + osm_web_service("@", "ridley"), + osm_web_service("www", "ridley"), + osm_web_service("wiki", "ridley"), + osm_web_service("blog", "ridley"), + osm_web_service("crm", "ridley"), + osm_web_service("join", "ridley"), + osm_web_service("support", "ridley"), + osm_web_service("supporting", "ridley"), + osm_web_service("donate", "ridley"), + osm_web_service("board", "ridley"), + osm_web_service("dwg", "ridley"), + osm_web_service("mwg", "ridley"), + osm_web_service("operations", "naga.he"), // Nextcloud instance CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."), // Staging Blog - A("staging.blog", IPV4["tabaluga"]), - AAAA("staging.blog", IPV6["tabaluga"]), - // HTTPS / SVCB records - HTTPS("staging.blog", 1, ".", "alpn=h2"), + osm_web_service("staging.blog", "tabaluga"), - A("hardware", IPV4["idris.he"]), - - // HTTPS / SVCB records - HTTPS("hardware", 1, ".", "alpn=h2") + osm_web_service("hardware", "idris.he"), ); diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js index 14776b1..0f1aa12 100644 --- a/src/stateofthemap-eu.js +++ b/src/stateofthemap-eu.js @@ -23,11 +23,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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("2024", "openstreetmap-polska.github.io.") - + ); diff --git a/src/stateofthemap.js b/src/stateofthemap.js index d942728..5c1770a 100644 --- a/src/stateofthemap.js +++ b/src/stateofthemap.js @@ -46,59 +46,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", IPV4["naga.he"]), - AAAA("@", IPV6["naga.he"]), - A("www", IPV4["naga.he"]), - AAAA("www", IPV6["naga.he"]), - A("2025", IPV4["naga.he"]), - AAAA("2025", IPV6["naga.he"]), - A("2024", IPV4["naga.he"]), - AAAA("2024", IPV6["naga.he"]), - A("2022", IPV4["naga.he"]), - AAAA("2022", IPV6["naga.he"]), - A("2021", IPV4["naga.he"]), - AAAA("2021", IPV6["naga.he"]), - A("2020", IPV4["naga.he"]), - AAAA("2020", IPV6["naga.he"]), - A("2019", IPV4["naga.he"]), - AAAA("2019", IPV6["naga.he"]), - A("2018", IPV4["naga.he"]), - AAAA("2018", IPV6["naga.he"]), - A("2017", IPV4["naga.he"]), - AAAA("2017", IPV6["naga.he"]), - A("2016", IPV4["naga.he"]), - AAAA("2016", IPV6["naga.he"]), - A("2013", IPV4["naga.he"]), - AAAA("2013", IPV6["naga.he"]), - A("2012", IPV4["ridley"]), - A("2011", IPV4["ridley"]), - A("2010", IPV4["ridley"]), - A("2009", IPV4["naga.he"]), - AAAA("2009", IPV6["naga.he"]), - A("2008", IPV4["naga.he"]), - AAAA("2008", IPV6["naga.he"]), - A("2007", IPV4["naga.he"]), - AAAA("2007", IPV6["naga.he"]), - - // HTTPS / SVCB records - HTTPS("@", 1, ".", "alpn=h2"), - HTTPS("www", 1, ".", "alpn=h2"), - HTTPS("2025", 1, ".", "alpn=h2"), - HTTPS("2024", 1, ".", "alpn=h2"), - HTTPS("2022", 1, ".", "alpn=h2"), - HTTPS("2021", 1, ".", "alpn=h2"), - HTTPS("2020", 1, ".", "alpn=h2"), - HTTPS("2019", 1, ".", "alpn=h2"), - HTTPS("2018", 1, ".", "alpn=h2"), - HTTPS("2017", 1, ".", "alpn=h2"), - HTTPS("2016", 1, ".", "alpn=h2"), - HTTPS("2013", 1, ".", "alpn=h2"), - HTTPS("2012", 1, ".", "alpn=h2"), - HTTPS("2011", 1, ".", "alpn=h2"), - HTTPS("2010", 1, ".", "alpn=h2"), - HTTPS("2009", 1, ".", "alpn=h2"), - HTTPS("2008", 1, ".", "alpn=h2"), - HTTPS("2007", 1, ".", "alpn=h2"), + 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("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"), // Google Site Verification - Grant TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo"), diff --git a/src/switch2osm.js b/src/switch2osm.js index 16ff39c..bccbbfe 100644 --- a/src/switch2osm.js +++ b/src/switch2osm.js @@ -26,13 +26,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", IPV4["naga.he"]), - AAAA("@", IPV6["naga.he"]), - A("www", IPV4["naga.he"]), - AAAA("www", IPV6["naga.he"]), - - // HTTPS / SVCB records - HTTPS("@", 1, ".", "alpn=h2"), - HTTPS("www", 1, ".", "alpn=h2") + osm_web_service("@", "naga.he"), + osm_web_service("www", "naga.he") ); -- 2.39.5 From 108f25e0b01a8e7b43c931a197fb892da298f3d6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 6 Mar 2025 19:48:07 +0000 Subject: [PATCH 05/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 06/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 07/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 08/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 09/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 10/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 11/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 12/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 13/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 14/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 15/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 16/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