Use new cleaner PTR rfc4183 support

[dns.git] / src / osm-wiki.js

diff --git a/src/osm-wiki.js b/src/osm-wiki.js
index c93c8107d2be80a77fa72002cd60ba09fed2f131..3fb4add7865c7989d93b98d6126a185453761c8e 100644 (file)
--- a/src/osm-wiki.js
+++ b/src/osm-wiki.js
@@ -20,29 +20,20 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   MX("@", 10, QUALIFY("a.mx")),
 
-  A("a.mx", FAFNIR_IPV4),
-  AAAA("a.mx", FAFNIR_IPV6),
-  A("mail", FAFNIR_IPV4),
-  AAAA("mail", FAFNIR_IPV6),
-  A("mta-sts", FAFNIR_IPV4),
-  AAAA("mta-sts", FAFNIR_IPV6),
+  A("a.mx", FAFNIR_IPV4_HE),
+  AAAA("a.mx", FAFNIR_IPV6_HE),
+  A("mail", FAFNIR_IPV4_HE),
+  AAAA("mail", FAFNIR_IPV6_HE),
+  A("mta-sts", FAFNIR_IPV4_HE),
+  AAAA("mta-sts", FAFNIR_IPV6_HE),
 
-  // Publish SPF records indicating that only shenron sends mail
+  // Delegate SPF policy to the main domain
 
   SPF_BUILDER({
     label: "@",
     parts: [
       "v=spf1",
-      "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.179.128/27",       // amsterdam 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
-      "mx",                       // safety net if we change mx
+      "include:openstreetmap.org",      // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -67,11 +58,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"),
   TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"),
 
-  A("wiki", KONQI_IPV4),
-  AAAA("wiki", KONQI_IPV6),
-  A("www", KONQI_IPV4),
-  AAAA("www", KONQI_IPV6),
-  A("@", KONQI_IPV4),
-  AAAA("@", KONQI_IPV6)
+  A("wiki", KONQI_IPV4_HE),
+  AAAA("wiki", KONQI_IPV6_HE),
+  A("www", KONQI_IPV4_HE),
+  AAAA("www", KONQI_IPV6_HE),
+  A("@", KONQI_IPV4_HE),
+  AAAA("@", KONQI_IPV6_HE)
 
-);
\ No newline at end of file
+);