Use osm_web_service for all domains

diff --git a/src/opengeodata.js b/src/opengeodata.js
index 807df1ff680109766f519573ab0ad127d0032fb8..738c7d22cf27efc9378423947794e9a73a458d6e 100644 (file)
--- 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 e3e007685648a12f56768e2717c641ef5c4ee549..ccc02badc21610f970c0e5612de0749534d8fd1d 100644 (file)
--- 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 bf5d97f3c9e87aa3308923ac0fdd5f13ce1c4b53..db62c6a07941ce5fe06075147c31d0e32f36f7e1 100644 (file)
--- 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 cd4a20ebc8cac8429015436756c02b34bcaa560f..1167f28da62d96b47fa029df70d23f1bbb724492 100644 (file)
--- 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 dc5d257556fa06c859e5eeb7196230a14133189d..b78a5a1f488734ddcea01a604d356eb87f021c01 100644 (file)
--- 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 b7aaf1f6ff5cb6097dc907b37958dd730f9b2f37..899fc36f104646f9f8e954a42c1ba9ae99154b14 100644 (file)
--- 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 642e58455f2b82432c404c50beeecd82a5f21dc7..0ad8995dcc87ec207a97a72b5cd874f1a02467d8 100644 (file)
--- 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 14776b1ebfd9df7168232dce76a8caf2c6b29715..0f1aa122288feace73ca5934762fd6092dc75cd7 100644 (file)
--- 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 d942728ceeaca8b37cdd275b81119cafa3002e71..5c1770a649d2aa4232478b3d2ee999f1f6b9cb85 100644 (file)
--- 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 16ff39c60d06b454b13a39a7beeadac5dc7f8e42..bccbbfe3959e97a8b411fa83bf22010f946fcbd5 100644 (file)
--- 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")
 
 );