Remove duplicate preferred origins

[dns.git] / src / osmfoundation

diff --git a/src/osmfoundation b/src/osmfoundation
index a7b7d99b98c7f398880b1bb1897519f669dfd90e..8b4a9278abfef12c84ed1a06a322ba64d010ea66 100644 (file)
--- a/src/osmfoundation
+++ b/src/osmfoundation
@@ -8,17 +8,21 @@
 .osmfoundation::b.ns.bytemark.co.uk
 .osmfoundation::c.ns.bytemark.co.uk
 
+# Publish a CAA record indicating that only letsencrypt should issue certificates
+
+:osmfoundation:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
+
 # SPF Record
 
-'osmfoundation:v=spf1 a\072shenron.openstreetmap.org include\072aspmx.googlemail.com ~all:3600
+'osmfoundation:v=spf1 a\072shenron.openstreetmap.org include\072_spf.google.com ~all:3600
 
 # Let google handle email
 
 @osmfoundation::aspmx.l.google.com:1:3600
 @osmfoundation::alt1.aspmx.l.google.com:5:3600
 @osmfoundation::alt2.aspmx.l.google.com:5:3600
-@osmfoundation::aspmx2.googlemail.com:10:3600
-@osmfoundation::aspmx3.googlemail.com:10:3600
+@osmfoundation::alt3.aspmx.l.google.com:10:3600
+@osmfoundation::alt4.aspmx.l.google.com:10:3600
 
 # Handle mail for the crm subdomain ourselves
 
@@ -47,11 +51,14 @@ Csites.osmfoundation:ghs.google.com
 
 # Main web server and it's aliases
 
-+osmfoundation:128.40.45.205:600
-+old.osmfoundation:128.40.45.205
-+www.osmfoundation:128.40.45.205:600
-+wiki.osmfoundation:128.40.45.205:600
-+blog.osmfoundation:128.40.45.205:600
-+vote.osmfoundation:128.40.45.205
-+accounts.osmfoundation:128.40.45.205
-+crm.osmfoundation:128.40.45.205
++osmfoundation:193.60.236.19:600
++old.osmfoundation:193.60.236.19:600
++www.osmfoundation:193.60.236.19:600
++wiki.osmfoundation:193.60.236.19:600
++blog.osmfoundation:193.60.236.19:600
++crm.osmfoundation:193.60.236.19:600
++join.osmfoundation:193.60.236.19:600
++board.osmfoundation:193.60.236.19:600
++dwg.osmfoundation:193.60.236.19:600
++mwg.osmfoundation:193.60.236.19:600
++operations.osmfoundation:193.60.236.19:600