X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/9324b6998b8540604a2331946d0e7ac07acb6317..78185840e3800017026cbef210b7fc0db43be9f9:/src/openstreetmap-uk?ds=sidebyside

diff --git a/src/openstreetmap-uk b/src/openstreetmap-uk
index a9c1ff2..2727c5c 100644
--- a/src/openstreetmap-uk
+++ b/src/openstreetmap-uk
@@ -8,14 +8,21 @@
 .openstreetmap-uk::b.ns.bytemark.co.uk
 .openstreetmap-uk::c.ns.bytemark.co.uk
 
+# Publish a CAA record indicating that only letsencrypt should issue certificates
+
+:openstreetmap-uk:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147
+
 # Make the virtual machine the primary MX with Bytemark as backup
 
 @openstreetmap-uk::a.mx.openstreetmap.org:10
-@openstreetmap-uk::backup.mx.bytemark.co.uk:20
 
 # Publish an SPF record indicating that only shenron sends mail
 
-'openstreetmap-uk:v=spf1 include\072openstreetmap.org ~all
+'openstreetmap-uk:v=spf1 include\072openstreetmap.org -all
+
+# Delegate MTA-STS policy
+
+C_mta-sts.openstreetmap-uk:_mta-sts.openstreetmap.org
 
 # Main web servers and their aliases
 
@@ -27,7 +34,41 @@ Cwww.openstreetmap-uk:www.openstreetmap.org
 Capi.openstreetmap-uk:api.openstreetmap.org
 
 # Andy Street calendar instance
-Ccalendar.openstreetmap-uk:cappuccino.andystreet.me.uk
+Ccalendar.openstreetmap-uk:osmcal.street.me.uk
 
 # Shaun McDonald taginfo instance
-+taginfo.openstreetmap-uk:144.76.98.136:3600
+Ctaginfo.openstreetmap-uk:proxy.mythic-beasts.com
+
+# Aerial imagery sites
++hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
+3hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++a.hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
+3a.hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++b.hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
+3b.hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++c.hampshire.aerial.openstreetmap-uk:178.250.74.36:3600
+3c.hampshire.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++surrey.aerial.openstreetmap-uk:178.250.74.36:3600
+3surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++a.surrey.aerial.openstreetmap-uk:178.250.74.36:3600
+3a.surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++b.surrey.aerial.openstreetmap-uk:178.250.74.36:3600
+3b.surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++c.surrey.aerial.openstreetmap-uk:178.250.74.36:3600
+3c.surrey.aerial.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++os.openstreetmap-uk:178.250.74.36:3600
+3os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++a.os.openstreetmap-uk:178.250.74.36:3600
+3a.os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++b.os.openstreetmap-uk:178.250.74.36:3600
+3b.os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++c.os.openstreetmap-uk:178.250.74.36:3600
+3c.os.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++ea.openstreetmap-uk:178.250.74.36:3600
+3ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++a.ea.openstreetmap-uk:178.250.74.36:3600
+3a.ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++b.ea.openstreetmap-uk:178.250.74.36:3600
+3b.ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600
++c.ea.openstreetmap-uk:178.250.74.36:3600
+3c.ea.openstreetmap-uk:2a02165800040000dad385fffe5d875e:3600