Move nominatim to pummelzacken

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index b8662a1d312518baf4b71784879661d5271d8dfa..05484d6e7ab573a2612aeb019cc2def8578f88e1 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -11,6 +11,10 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 .openstreetmap::b.ns.bytemark.co.uk
 .openstreetmap::c.ns.bytemark.co.uk
 
 .openstreetmap::b.ns.bytemark.co.uk
 .openstreetmap::c.ns.bytemark.co.uk
 

+# Publish a CAA record indicating that only letsencrypt should issue certificates
+
+:openstreetmap: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:212.110.172.32:a:10
 # Make the virtual machine the primary MX with Bytemark as backup
 
 @openstreetmap:212.110.172.32:a:10


@@ -23,10 +27,12 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 # Publish an SPF record indicating that only shenron sends mail
 
 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ip6\0722001\07241c9\0721\072400\072\07232 ~all
 # Publish an SPF record indicating that only shenron sends mail
 
 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ip6\0722001\07241c9\0721\072400\072\07232 ~all

+'otrs.openstreetmap:v=spf1 ip4\07289.16.179.150 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ip6\0722001\07241c9\0721\072400\072\07232 ~all
+
+# Google postmaster tools verification

 
 

-# Add Google Postmaster Tools Verification
-# Grant

 Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com

+'openstreetmap:google-site-verification=oMMclkNxMVPPk0lhThg5S7cuzUZmtL_OZWTCrAwNcqQ

 
 # Delegate geo.openstreetmap.org to PowerDNS
 
 
 # Delegate geo.openstreetmap.org to PowerDNS
 


@@ -45,84 +51,79 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 # Main web servers and their aliases
 
 
 # Main web servers and their aliases
 

-+spike-01.openstreetmap:193.63.75.99
-3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
-+openstreetmap:193.63.75.99:600
-3openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+www.openstreetmap:193.63.75.99:600
-3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+api.openstreetmap:193.63.75.99:600
-3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+maps.openstreetmap:193.63.75.99:600
-3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600
-+mapz.openstreetmap:193.63.75.99:600
-3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++spike-01.openstreetmap:193.63.75.99:600
+3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+#+openstreetmap:193.63.75.99:600
+#3openstreetmap:2001063000120500021a4bfffea5fd2a:600
+#+www.openstreetmap:193.63.75.99:600
+#3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+#+api.openstreetmap:193.63.75.99:600
+#3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+#+maps.openstreetmap:193.63.75.99:600
+#3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600
+#+mapz.openstreetmap:193.63.75.99:600
+#3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600

 +spike-01.ic.openstreetmap:146.179.159.162:600
 +spike-01.ic.openstreetmap:146.179.159.162:600

-+www.ic.openstreetmap:146.179.159.162:600

 +spike-01.oob.openstreetmap:146.179.159.188:600
 
 +spike-01.oob.openstreetmap:146.179.159.188:600
 

-+spike-02.openstreetmap:193.63.75.100
-3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
-+openstreetmap:193.63.75.100:600
-3openstreetmap:20010630001205000219bbfffe393d9e:600
-+www.openstreetmap:193.63.75.100:600
-3www.openstreetmap:20010630001205000219bbfffe393d9e:600
-+api.openstreetmap:193.63.75.100:600
-3api.openstreetmap:20010630001205000219bbfffe393d9e:600
-+maps.openstreetmap:193.63.75.100:600
-3maps.openstreetmap:20010630001205000219bbfffe393d9e:600
-+mapz.openstreetmap:193.63.75.100:600
-3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600
++spike-02.openstreetmap:193.63.75.100:600
+3spike-02.openstreetmap:20010630001205000219bbfffe393d9e:600
+#+openstreetmap:193.63.75.100:600
+#3openstreetmap:20010630001205000219bbfffe393d9e:600
+#+www.openstreetmap:193.63.75.100:600
+#3www.openstreetmap:20010630001205000219bbfffe393d9e:600
+#+api.openstreetmap:193.63.75.100:600
+#3api.openstreetmap:20010630001205000219bbfffe393d9e:600
+#+maps.openstreetmap:193.63.75.100:600
+#3maps.openstreetmap:20010630001205000219bbfffe393d9e:600
+#+mapz.openstreetmap:193.63.75.100:600
+#3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600

 +spike-02.ic.openstreetmap:146.179.159.163:600
 +spike-02.ic.openstreetmap:146.179.159.163:600

-+www.ic.openstreetmap:146.179.159.163:600

 +spike-02.oob.openstreetmap:146.179.159.180:600
 
 +spike-02.oob.openstreetmap:146.179.159.180:600
 

-+spike-03.openstreetmap:193.63.75.103
-3spike-03.openstreetmap:20010630001205000219bbfffe398aba
-+openstreetmap:193.63.75.103:600
-3openstreetmap:20010630001205000219bbfffe398aba:600
-+www.openstreetmap:193.63.75.103:600
-3www.openstreetmap:20010630001205000219bbfffe398aba:600
-+api.openstreetmap:193.63.75.103:600
-3api.openstreetmap:20010630001205000219bbfffe398aba:600
-+maps.openstreetmap:193.63.75.103:600
-3maps.openstreetmap:20010630001205000219bbfffe398aba:600
-+mapz.openstreetmap:193.63.75.103:600
-3mapz.openstreetmap:20010630001205000219bbfffe398aba:600
++spike-03.openstreetmap:193.63.75.103:600
+3spike-03.openstreetmap:20010630001205000219bbfffe398aba:600
+#+openstreetmap:193.63.75.103:600
+#3openstreetmap:20010630001205000219bbfffe398aba:600
+#+www.openstreetmap:193.63.75.103:600
+#3www.openstreetmap:20010630001205000219bbfffe398aba:600
+#+api.openstreetmap:193.63.75.103:600
+#3api.openstreetmap:20010630001205000219bbfffe398aba:600
+#+maps.openstreetmap:193.63.75.103:600
+#3maps.openstreetmap:20010630001205000219bbfffe398aba:600
+#+mapz.openstreetmap:193.63.75.103:600
+#3mapz.openstreetmap:20010630001205000219bbfffe398aba:600

 +spike-03.ic.openstreetmap:146.179.159.171:600
 +spike-03.ic.openstreetmap:146.179.159.171:600

-+www.ic.openstreetmap:146.179.159.171:600

 +spike-03.oob.openstreetmap:146.179.159.187:600
 
 +spike-04.openstreetmap:89.16.162.21
 3spike-04.openstreetmap:200141c9000200d60000000000000021
 +spike-03.oob.openstreetmap:146.179.159.187:600
 
 +spike-04.openstreetmap:89.16.162.21
 3spike-04.openstreetmap:200141c9000200d60000000000000021

-#+openstreetmap:89.16.162.21:600
-#3openstreetmap:200141c9000200d60000000000000021:600
-#+www.openstreetmap:89.16.162.21:600
-#3www.openstreetmap:200141c9000200d60000000000000021:600
-#+api.openstreetmap:89.16.162.21:600
-#3api.openstreetmap:200141c9000200d60000000000000021:600
-#+maps.openstreetmap:89.16.162.21:600
-#3maps.openstreetmap:200141c9000200d60000000000000021:600
-#+mapz.openstreetmap:89.16.162.21:600
-#3mapz.openstreetmap:200141c9000200d60000000000000021:600
++openstreetmap:89.16.162.21:600
+3openstreetmap:200141c9000200d60000000000000021:600
++www.openstreetmap:89.16.162.21:600
+3www.openstreetmap:200141c9000200d60000000000000021:600
++api.openstreetmap:89.16.162.21:600
+3api.openstreetmap:200141c9000200d60000000000000021:600
++maps.openstreetmap:89.16.162.21:600
+3maps.openstreetmap:200141c9000200d60000000000000021:600
++mapz.openstreetmap:89.16.162.21:600
+3mapz.openstreetmap:200141c9000200d60000000000000021:600

 +spike-04.bm.openstreetmap:10.0.32.21
 +spike-04.bm.openstreetmap:10.0.32.21

-+www.bm.openstreetmap:10.0.32.21:600

 +spike-04.oob.openstreetmap:10.0.33.21
 
 +spike-05.openstreetmap:89.16.162.22
 3spike-05.openstreetmap:200141c9000200d60000000000000022
 +spike-04.oob.openstreetmap:10.0.33.21
 
 +spike-05.openstreetmap:89.16.162.22
 3spike-05.openstreetmap:200141c9000200d60000000000000022

-#+openstreetmap:89.16.162.22:600
-#3openstreetmap:200141c9000200d60000000000000022:600
-#+www.openstreetmap:89.16.162.22:600
-#3www.openstreetmap:200141c9000200d60000000000000022:600
-#+api.openstreetmap:89.16.162.22:600
-#3api.openstreetmap:200141c9000200d60000000000000022:600
-#+maps.openstreetmap:89.16.162.22:600
-#3maps.openstreetmap:200141c9000200d60000000000000022:600
-#+mapz.openstreetmap:89.16.162.22:600
-#3mapz.openstreetmap:200141c9000200d60000000000000022:600
++openstreetmap:89.16.162.22:600
+3openstreetmap:200141c9000200d60000000000000022:600
++www.openstreetmap:89.16.162.22:600
+3www.openstreetmap:200141c9000200d60000000000000022:600
++api.openstreetmap:89.16.162.22:600
+3api.openstreetmap:200141c9000200d60000000000000022:600
++maps.openstreetmap:89.16.162.22:600
+3maps.openstreetmap:200141c9000200d60000000000000022:600
++mapz.openstreetmap:89.16.162.22:600
+3mapz.openstreetmap:200141c9000200d60000000000000022:600

 +spike-05.bm.openstreetmap:10.0.32.22
 +spike-05.bm.openstreetmap:10.0.32.22

-+www.bm.openstreetmap:10.0.32.22:600

 +spike-05.oob.openstreetmap:10.0.33.22
 
 # Rails application servers
 +spike-05.oob.openstreetmap:10.0.33.22
 
 # Rails application servers


@@ -149,22 +150,15 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 
 # Nominatim servers
 
 
 # Nominatim servers
 

-+poldi.openstreetmap:193.63.75.101
-3poldi.openstreetmap:200106300012050002e081fffec5333e
-#+nominatim.openstreetmap:193.63.75.101:600
-#3nominatim.openstreetmap:200106300012050002e081fffec5333e:600
-+poldi.ic.openstreetmap:146.179.159.164:600
-+poldi.oob.openstreetmap:146.179.159.186:600
-

 +pummelzacken.openstreetmap:193.60.236.18
 +pummelzacken.openstreetmap:193.60.236.18

-#+nominatim.openstreetmap:193.60.236.18:600
++nominatim.openstreetmap:193.60.236.18:600

 +pummelzacken.ucl.openstreetmap:10.0.0.20
 +pummelzacken.oob.openstreetmap:10.0.1.20
 
 +pummelzacken.ucl.openstreetmap:10.0.0.20
 +pummelzacken.oob.openstreetmap:10.0.1.20
 

-+dulcy.openstreetmap:193.63.75.109
-3dulcy.openstreetmap:20010630001205000ec47afffe6696d2
-+nominatim.openstreetmap:193.63.75.109:600
-3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600
++dulcy.openstreetmap:193.63.75.109:600
+3dulcy.openstreetmap:20010630001205000ec47afffe6696d2:600
+#+nominatim.openstreetmap:193.63.75.109:600
+#3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600

 +dulcy.ic.openstreetmap:146.179.159.179:600
 #+dulcy.oob.openstreetmap:
 
 +dulcy.ic.openstreetmap:146.179.159.179:600
 #+dulcy.oob.openstreetmap:
 


@@ -175,60 +169,58 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 

-# Taginfo servers
+# Taginfo server

 
 +grindtooth.openstreetmap:193.60.236.15
 
 +grindtooth.openstreetmap:193.60.236.15

-#+taginfo.openstreetmap:193.60.236.15:600
++taginfo.openstreetmap:193.60.236.15:600

 +grindtooth.ucl.openstreetmap:10.0.0.19
 +grindtooth.oob.openstreetmap:10.0.1.19
 
 +grindtooth.ucl.openstreetmap:10.0.0.19
 +grindtooth.oob.openstreetmap:10.0.1.19
 

-+stormfly-01.openstreetmap:140.211.167.104
-+taginfo.openstreetmap:140.211.167.104:600
-+stormfly-01.oob.openstreetmap:10.0.0.99
-

 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 

-+orm.openstreetmap:193.63.75.98
-3orm.openstreetmap:200106300012050002e081fffec52a8c
++orm.openstreetmap:193.63.75.98:600
+3orm.openstreetmap:200106300012050002e081fffec52a8c:600

 #+orm.ic.openstreetmap:10.0.16.2
 +orm.oob.openstreetmap:146.179.159.175:600
 #+orm.ic.openstreetmap:10.0.16.2
 +orm.oob.openstreetmap:146.179.159.175:600

+

 +yevaud.openstreetmap:193.60.236.22
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 +yevaud.openstreetmap:193.60.236.22
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15

+

 +vial.openstreetmap:138.201.195.31
 3vial.openstreetmap:2a0104f801723cde0000000000000002
 +vial.openstreetmap:138.201.195.31
 3vial.openstreetmap:2a0104f801723cde0000000000000002

+

 +scorch.openstreetmap:176.31.235.79
 3scorch.openstreetmap:200141d00002fc4f0000000000000001
 +scorch.openstreetmap:176.31.235.79
 3scorch.openstreetmap:200141d00002fc4f0000000000000001

+
++rhaegal.openstreetmap:161.53.248.77:600
+

 Ctile.openstreetmap:tile.geo.openstreetmap.org
 Ca.tile.openstreetmap:tile.geo.openstreetmap.org
 Cb.tile.openstreetmap:tile.geo.openstreetmap.org
 Cc.tile.openstreetmap:tile.geo.openstreetmap.org
 Ctile.openstreetmap:tile.geo.openstreetmap.org
 Ca.tile.openstreetmap:tile.geo.openstreetmap.org
 Cb.tile.openstreetmap:tile.geo.openstreetmap.org
 Cc.tile.openstreetmap:tile.geo.openstreetmap.org

-Cparent.tile.openstreetmap:render.openstreetmap.org

 
 # Services machine
 
 
 # Services machine
 

-+ironbelly.openstreetmap:193.63.75.107
-3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef
-+chef.openstreetmap:193.63.75.107
-3chef.openstreetmap:2001063000120500022590fffec4f6ef
-+backup.openstreetmap:193.63.75.107
-3backup.openstreetmap:2001063000120500022590fffec4f6ef
-+stats.openstreetmap:193.63.75.107
-3stats.openstreetmap:2001063000120500022590fffec4f6ef
-+planet.openstreetmap:193.63.75.107:600
-3planet.openstreetmap:2001063000120500022590fffec4f6ef:600
-+logstash.openstreetmap:193.63.75.107
-3logstash.openstreetmap:2001063000120500022590fffec4f6ef
-+hardware.openstreetmap:193.63.75.107
-3hardware.openstreetmap:2001063000120500022590fffec4f6ef
++ironbelly.openstreetmap:193.63.75.107:600
+3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef:600
+#+backup.openstreetmap:193.63.75.107:600
+#3backup.openstreetmap:2001063000120500022590fffec4f6ef:600
+#+planet.openstreetmap:193.63.75.107:600
+#3planet.openstreetmap:2001063000120500022590fffec4f6ef:600
++stats.openstreetmap:193.63.75.107:600
+3stats.openstreetmap:2001063000120500022590fffec4f6ef:600
++logstash.openstreetmap:193.63.75.107:600
+3logstash.openstreetmap:2001063000120500022590fffec4f6ef:600

 +ironbelly.ic.openstreetmap:146.179.159.177:600
 +ironbelly.oob.openstreetmap:146.179.159.176:600
 +ironbelly.ic.openstreetmap:146.179.159.177:600
 +ironbelly.oob.openstreetmap:146.179.159.176:600

-+backup.ic.openstreetmap:146.179.159.177:600

 
 +grisu.openstreetmap:89.16.162.20
 3grisu.openstreetmap:200141c9000200d60000000000000020
 
 +grisu.openstreetmap:89.16.162.20
 3grisu.openstreetmap:200141c9000200d60000000000000020

-#+planet.openstreetmap:89.16.162.20:600
-#3planet.openstreetmap:200141c9000200d60000000000000020:600
++backup.openstreetmap:89.16.162.20:600
+3backup.openstreetmap:200141c9000200d60000000000000020:600
++planet.openstreetmap:89.16.162.20:600
+3planet.openstreetmap:200141c9000200d60000000000000020:600

 +grisu.bm.openstreetmap:10.0.32.20
 +grisu.oob.openstreetmap:10.0.33.20
 
 +grisu.bm.openstreetmap:10.0.32.20
 +grisu.oob.openstreetmap:10.0.33.20
 


@@ -237,12 +229,13 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +karm.ic.openstreetmap:146.179.159.168:600
 +karm.oob.openstreetmap:146.179.159.173:600
 
 +karm.ic.openstreetmap:146.179.159.168:600
 +karm.oob.openstreetmap:146.179.159.173:600
 

++eddie.ucl.openstreetmap:10.0.0.10
++eddie.oob.openstreetmap:10.0.1.10
+

 +katla.bm.openstreetmap:10.0.32.40
 +katla.bm.openstreetmap:10.0.32.40

-+db.openstreetmap:10.0.32.40:600

 +katla.oob.openstreetmap:10.0.33.40
 
 +ramoth.ic.openstreetmap:146.179.159.170:600
 +katla.oob.openstreetmap:10.0.33.40
 
 +ramoth.ic.openstreetmap:146.179.159.170:600

-+db-slave.openstreetmap:146.179.159.170:600

 +ramoth.oob.openstreetmap:146.179.159.181:600
 
 +fafnir.openstreetmap:52.50.86.69
 +ramoth.oob.openstreetmap:146.179.159.181:600
 
 +fafnir.openstreetmap:52.50.86.69


@@ -266,6 +259,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +otrs.openstreetmap:193.60.236.19
 +blog.openstreetmap:193.60.236.19
 +foundation.openstreetmap:193.60.236.19
 +otrs.openstreetmap:193.60.236.19
 +blog.openstreetmap:193.60.236.19
 +foundation.openstreetmap:193.60.236.19

++hot.openstreetmap:193.60.236.19

 +ridley.ucl.openstreetmap:10.0.0.3
 +ridley.oob.openstreetmap:10.0.1.3
 
 +ridley.ucl.openstreetmap:10.0.0.3
 +ridley.oob.openstreetmap:10.0.1.3
 


@@ -309,9 +303,14 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +urmel.ucl.openstreetmap:10.0.0.6
 +urmel.oob.openstreetmap:10.0.1.6
 
 +urmel.ucl.openstreetmap:10.0.0.6
 +urmel.oob.openstreetmap:10.0.1.6
 

-# Gosmore routing server
+# Chef server

 
 +sarel.openstreetmap:193.60.236.20
 
 +sarel.openstreetmap:193.60.236.20

++chef.openstreetmap:193.60.236.20
++hardware.openstreetmap:193.60.236.20
++acme.openstreetmap:193.60.236.20
++git.openstreetmap:193.60.236.20:600
++dns.openstreetmap:193.60.236.20:600

 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 
 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 


@@ -328,7 +327,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Managed network switches
 
 
 # Managed network switches
 

-+switch1.openstreetmap:193.63.75.102
++switch1.openstreetmap:193.63.75.102:600

 +switch2.ic.openstreetmap:146.179.159.169:600
 
 # Bytemark machine, and the services which operate from it
 +switch2.ic.openstreetmap:146.179.159.169:600
 
 # Bytemark machine, and the services which operate from it


@@ -337,65 +336,66 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +mail.openstreetmap:212.110.172.32
 +lists.openstreetmap:212.110.172.32
 +svn.openstreetmap:212.110.172.32
 +mail.openstreetmap:212.110.172.32
 +lists.openstreetmap:212.110.172.32
 +svn.openstreetmap:212.110.172.32

-+git.openstreetmap:212.110.172.32

 +trac.openstreetmap:212.110.172.32
 +irc.openstreetmap:212.110.172.32
 +help.openstreetmap:212.110.172.32
 +trac.openstreetmap:212.110.172.32
 +irc.openstreetmap:212.110.172.32
 +help.openstreetmap:212.110.172.32

-+shop.openstreetmap:212.110.172.32
-+dns.openstreetmap:212.110.172.32
++blogs.openstreetmap:212.110.172.32:600

 +shenron.bm.openstreetmap:10.0.16.3
 
 3shenron.openstreetmap:200141c9000104000000000000000032
 3mail.openstreetmap:200141c9000104000000000000000032
 3lists.openstreetmap:200141c9000104000000000000000032
 3svn.openstreetmap:200141c9000104000000000000000032
 +shenron.bm.openstreetmap:10.0.16.3
 
 3shenron.openstreetmap:200141c9000104000000000000000032
 3mail.openstreetmap:200141c9000104000000000000000032
 3lists.openstreetmap:200141c9000104000000000000000032
 3svn.openstreetmap:200141c9000104000000000000000032

-3git.openstreetmap:200141c9000104000000000000000032

 3trac.openstreetmap:200141c9000104000000000000000032
 3help.openstreetmap:200141c9000104000000000000000032
 3trac.openstreetmap:200141c9000104000000000000000032
 3help.openstreetmap:200141c9000104000000000000000032

-3shop.openstreetmap:200141c9000104000000000000000032
-3dns.openstreetmap:200141c9000104000000000000000032
+3blogs.openstreetmap:200141c9000104000000000000000032:600

 
 

-# Wiki server
+# Wiki servers

 
 

-+ouroboros.openstreetmap:193.63.75.106
-3ouroboros.openstreetmap:200106300012050002237dfffeea813a
-+wiki.openstreetmap:193.63.75.106:600
++ouroboros.openstreetmap:193.63.75.106:600
+3ouroboros.openstreetmap:200106300012050002237dfffeea813a:600
+#+wiki.openstreetmap:193.63.75.106:600
+#3wiki.openstreetmap:200106300012050002237dfffeea813a:600

 +ouroboros.ic.openstreetmap:146.179.159.172:600
 +ouroboros.oob.openstreetmap:146.179.159.178:600
 
 +ouroboros.ic.openstreetmap:146.179.159.172:600
 +ouroboros.oob.openstreetmap:146.179.159.178:600
 

++stormfly-01.openstreetmap:140.211.167.104
+6stormfly-01.openstreetmap:2605bc8030100700000000008cdea768
++wiki.openstreetmap:140.211.167.104:600
+3wiki.openstreetmap:2605bc8030100700000000008cdea768:600
++stormfly-01.oob.openstreetmap:10.0.0.99
+

 # GPS tile server
 
 +noquiklos.openstreetmap:193.60.236.16
 # GPS tile server
 
 +noquiklos.openstreetmap:193.60.236.16

++gps-tile.openstreetmap:193.60.236.16
++a.gps-tile.openstreetmap:193.60.236.16
++b.gps-tile.openstreetmap:193.60.236.16
++c.gps-tile.openstreetmap:193.60.236.16

 +gps.tile.openstreetmap:193.60.236.16
 +gps-a.tile.openstreetmap:193.60.236.16
 +gps-b.tile.openstreetmap:193.60.236.16
 +gps-c.tile.openstreetmap:193.60.236.16
 +gps.tile.openstreetmap:193.60.236.16
 +gps-a.tile.openstreetmap:193.60.236.16
 +gps-b.tile.openstreetmap:193.60.236.16
 +gps-c.tile.openstreetmap:193.60.236.16

-+a.gps-tile.openstreetmap:193.60.236.16
-+b.gps-tile.openstreetmap:193.60.236.16
-+c.gps-tile.openstreetmap:193.60.236.16

 +noquiklos.ucl.openstreetmap:10.0.0.13
 +noquiklos.oob.openstreetmap:10.0.1.13
 
 # Tile cache servers
 
 +noquiklos.ucl.openstreetmap:10.0.0.13
 +noquiklos.oob.openstreetmap:10.0.1.13
 
 # Tile cache servers
 

-+gorynych.openstreetmap:130.193.62.73
++gorynych.openstreetmap:5.45.248.21

 3gorynych.openstreetmap:2a0206b8b0105065000000000000a001
 3gorynych.openstreetmap:2a0206b8b0105065000000000000a001

-+lurien.openstreetmap:193.55.222.229

 +trogdor.openstreetmap:134.90.146.26
 +trogdor.oob.openstreetmap:134.90.146.30
 +ridgeback.openstreetmap:31.169.50.10
 +ridgeback.oob.openstreetmap:31.169.50.14
 +jakelong.openstreetmap:64.62.205.202:600
 3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca:600
 +trogdor.openstreetmap:134.90.146.26
 +trogdor.oob.openstreetmap:134.90.146.30
 +ridgeback.openstreetmap:31.169.50.10
 +ridgeback.oob.openstreetmap:31.169.50.14
 +jakelong.openstreetmap:64.62.205.202:600
 3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca:600

-+nepomuk.openstreetmap:77.95.70.166
-3nepomuk.openstreetmap:2a0391800001002100000000000000a6
++nepomuk.openstreetmap:77.95.65.39
+3nepomuk.openstreetmap:2a039180000001000000000000000007

 +simurgh.openstreetmap:94.20.20.55
 +katie.openstreetmap:144.76.70.77
 3katie.openstreetmap:2a0104f80191834c0000000000000002
 +konqi.openstreetmap:81.7.11.83
 3konqi.openstreetmap:2a020180000100010000000005170b53
 +simurgh.openstreetmap:94.20.20.55
 +katie.openstreetmap:144.76.70.77
 3katie.openstreetmap:2a0104f80191834c0000000000000002
 +konqi.openstreetmap:81.7.11.83
 3konqi.openstreetmap:2a020180000100010000000005170b53

-+nadder-01.openstreetmap:192.163.219.36
-+nadder-02.openstreetmap:192.163.219.40

 +longma.openstreetmap:140.110.240.7
 3longma.openstreetmap:20010e10200002400000000000000007
 +viserion.openstreetmap:193.198.233.211
 +longma.openstreetmap:140.110.240.7
 3longma.openstreetmap:20010e10200002400000000000000007
 +viserion.openstreetmap:193.198.233.211


@@ -409,20 +409,58 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +cmok.openstreetmap:31.130.201.40
 3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b
 +stormfly-02.openstreetmap:140.211.167.105
 +cmok.openstreetmap:31.130.201.40
 3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b
 +stormfly-02.openstreetmap:140.211.167.105

+6stormfly-02.openstreetmap:2605bc8030100700000000008cdea769

 +stormfly-02.oob.openstreetmap:10.0.0.108
 +odin.openstreetmap:130.225.254.123
 3odin.openstreetmap:20010878034600000000000000000123
 +culebre.openstreetmap:155.210.4.103
 +stormfly-02.oob.openstreetmap:10.0.0.108
 +odin.openstreetmap:130.225.254.123
 3odin.openstreetmap:20010878034600000000000000000123
 +culebre.openstreetmap:155.210.4.103

-
-# Blog aggregator (on Shaun McDonald's VM)
-
-+blogs.openstreetmap:213.138.110.209:600
-3blogs.openstreetmap:200141c8005105d1feff00fffe0032b8:600
-
-# Continuous integration server (on Shaun McDonald's machine)
-
-+ci.openstreetmap:144.76.98.136
-+cruise.openstreetmap:144.76.98.136
++kalessin.openstreetmap:185.66.195.245
+3kalessin.openstreetmap:2a032260200000010000000000000005
++angor.openstreetmap:196.10.54.165
+#3angor.openstreetmap:200143f801f40b00b283fefffed8dd45
++ladon.openstreetmap:83.212.2.116
+3ladon.openstreetmap:200106482ffe00040000000000000116
++komodo.openstreetmap:103.253.107.131
++ascalon.openstreetmap:184.107.48.228
+
+# Blades
+
++tiamat-00.openstreetmap:193.60.236.40
++tiamat-00.ucl.openstreetmap:10.0.0.40
++tiamat-00.oob.openstreetmap:10.0.1.40
++tiamat-01.openstreetmap:193.60.236.41
++tiamat-01.ucl.openstreetmap:10.0.0.41
++tiamat-01.oob.openstreetmap:10.0.1.41
++tiamat-02.openstreetmap:193.60.236.42
++tiamat-02.ucl.openstreetmap:10.0.0.42
++tiamat-02.oob.openstreetmap:10.0.1.42
++tiamat-03.openstreetmap:193.60.236.43
++tiamat-03.ucl.openstreetmap:10.0.0.43
++tiamat-03.oob.openstreetmap:10.0.1.43
++tiamat-10.openstreetmap:193.60.236.44
++tiamat-10.ucl.openstreetmap:10.0.0.44
++tiamat-10.oob.openstreetmap:10.0.1.44
++tiamat-11.openstreetmap:193.60.236.45
++tiamat-11.ucl.openstreetmap:10.0.0.45
++tiamat-11.oob.openstreetmap:10.0.1.45
++tiamat-12.openstreetmap:193.60.236.46
++tiamat-12.ucl.openstreetmap:10.0.0.46
++tiamat-12.oob.openstreetmap:10.0.1.46
++tiamat-13.openstreetmap:193.60.236.47
++tiamat-13.ucl.openstreetmap:10.0.0.47
++tiamat-13.oob.openstreetmap:10.0.1.47
++tiamat-20.openstreetmap:193.60.236.48
++tiamat-20.ucl.openstreetmap:10.0.0.48
++tiamat-20.oob.openstreetmap:10.0.1.48
++tiamat-21.openstreetmap:193.60.236.49
++tiamat-21.ucl.openstreetmap:10.0.0.49
++tiamat-21.oob.openstreetmap:10.0.1.49
++tiamat-22.openstreetmap:193.60.236.50
++tiamat-22.ucl.openstreetmap:10.0.0.50
++tiamat-22.oob.openstreetmap:10.0.1.50
++tiamat-23.openstreetmap:193.60.236.51
++tiamat-23.ucl.openstreetmap:10.0.0.51
++tiamat-23.oob.openstreetmap:10.0.1.51

 
 # Donation site
 
 
 # Donation site
 


@@ -432,9 +470,6 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 +dmca.openstreetmap:46.43.50.94:600
 
 
 +dmca.openstreetmap:46.43.50.94:600
 

-# HOT site
+# Uptime site at StatusCake

 
 

-+hot.openstreetmap:144.76.31.210
-+humanitarian.openstreetmap:144.76.31.210
-+hot-staging.openstreetmap:144.76.31.210
-+hot-dev.openstreetmap:144.76.31.210
+Cuptime.openstreetmap:uptime.statuscake.com