Drop vhagar from nominatim

[dns.git] / src / osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 866894fbbbde9cddee5d5facb2bc3bc8a1034e8e..d64efe0634018de5dbbcee612e60df00cdd4e0c9 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -29,9 +29,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "@",
     parts: [
       "v=spf1",
     label: "@",
     parts: [
       "v=spf1",

+      "include:mailbox.org",     // mailbox.org

       "include:_spf.google.com", // Google GSuite
       "include:_spf.google.com", // Google GSuite

-      "ip4:212.110.172.32",      // shenron ipv4
-      "ip6:2001:41c9:1:400::32", // shenron ipv6

       "ip4:184.104.226.98",      // fafnir ipv4
       "ip6:2001:470:1:b3b::2",   // fafnir ipv6
       "ip4:193.60.236.0/24",     // ucl external
       "ip4:184.104.226.98",      // fafnir ipv4
       "ip6:2001:470:1:b3b::2",   // fafnir ipv6
       "ip4:193.60.236.0/24",     // ucl external


@@ -39,7 +38,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip6:2001:470:1:fa1::/64", // amsterdam external
       "ip4:184.104.226.96/27",   // dublin external
       "ip6:2001:470:1:b3b::/64", // dublin external
       "ip6:2001:470:1:fa1::/64", // amsterdam external
       "ip4:184.104.226.96/27",   // dublin external
       "ip6:2001:470:1:b3b::/64", // dublin external

-      "include:mailbox.org",     // mailbox.org

       "-all"
     ]
   }),
       "-all"
     ]
   }),


@@ -109,7 +107,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("www", RIDLEY_IPV4),
   A("wiki", RIDLEY_IPV4),
   A("blog", RIDLEY_IPV4),
   A("www", RIDLEY_IPV4),
   A("wiki", RIDLEY_IPV4),
   A("blog", RIDLEY_IPV4),

-

   A("crm", RIDLEY_IPV4),
   A("join", RIDLEY_IPV4),
   A("support", RIDLEY_IPV4),
   A("crm", RIDLEY_IPV4),
   A("join", RIDLEY_IPV4),
   A("support", RIDLEY_IPV4),


@@ -122,10 +119,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("operations", NAGA_IPV4),
   AAAA("operations", NAGA_IPV6),
 
   A("operations", NAGA_IPV4),
   AAAA("operations", NAGA_IPV6),
 

+  // 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"),
+

   // Nextcloud instance
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 
   // Nextcloud instance
 
   CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
 

-  A("hardware", IDRIS_IPV4)
+  // Staging Blog
+  A("staging.blog", TABALUGA_IPV4),
+  AAAA("staging.blog", TABALUGA_IPV6),
+  // HTTPS / SVCB records
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+
+  A("hardware", IDRIS_IPV4),
+
+  // HTTPS / SVCB records
+  HTTPS("hardware", 1, ".", "alpn=h2")

 
 );
 
 );