Add OOB addresses for Bytemark machines

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index f737a540784af4589b21925b250ead4cf031eeed..53f942bae5aa4271440f0ecc47c1e89033291e19 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -13,7 +13,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # Make the virtual machine the primary MX with Bytemark as backup
 
 
 # Make the virtual machine the primary MX with Bytemark as backup
 

-@openstreetmap:212.110.172.32:a:10:600
+@openstreetmap:212.110.172.32:a:10

 @noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10
 @noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10


@@ -24,14 +24,24 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 '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
 
 
 '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
 

+# Add Google Postmaster Tools Verification
+# Grant
+Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
+

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

-&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap:600
-# nadder-02.openstreetmap.org
-&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
-# fume.openstreetmap.org
-&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
+&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap
+# saphira.openstreetmap.org
+&geo.openstreetmap:185.73.44.30:b.ns.openstreetmap
+# ridgeback.openstreetmap.org
+&geo.openstreetmap:31.169.50.10:c.ns.openstreetmap
+# jakelong.openstreetmap.org
+&geo.openstreetmap:64.62.205.202:d.ns.openstreetmap
+# katie.openstreetmap.org
+&geo.openstreetmap:144.76.70.77:e.ns.openstreetmap
+# stormfly-02.openstreetmap.org
+&geo.openstreetmap:140.211.167.105:f.ns.openstreetmap

 
 # Main web servers and their aliases
 
 
 # Main web servers and their aliases
 


@@ -83,6 +93,38 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 +www.ic.openstreetmap:146.179.159.171:3600
 +spike-03.oob.openstreetmap:146.179.159.187
 
 +www.ic.openstreetmap:146.179.159.171:3600
 +spike-03.oob.openstreetmap:146.179.159.187
 

++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
++spike-04.bm.openstreetmap:10.0.32.21
++www.bm.openstreetmap:10.0.32.21:3600
++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
++spike-05.bm.openstreetmap:10.0.32.22
++www.bm.openstreetmap:10.0.32.22:3600
++spike-05.oob.openstreetmap:10.0.33.22
+

 # Rails application servers
 
 +thorn-01.ic.openstreetmap:146.179.159.165
 # Rails application servers
 
 +thorn-01.ic.openstreetmap:146.179.159.165


@@ -97,12 +139,20 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 +rails3.ic.openstreetmap:146.179.159.167
 +thorn-03.oob.openstreetmap:146.179.159.183
 
 +rails3.ic.openstreetmap:146.179.159.167
 +thorn-03.oob.openstreetmap:146.179.159.183
 

++thorn-04.bm.openstreetmap:10.0.32.41
++rails4.bm.openstreetmap:10.0.32.41
++thorn-04.oob.openstreetmap:10.0.33.41
+
++thorn-05.bm.openstreetmap:10.0.32.42
++rails5.bm.openstreetmap:10.0.32.42
++thorn-05.oob.openstreetmap:10.0.33.42
+

 # Nominatim servers
 
 +poldi.openstreetmap:193.63.75.101
 3poldi.openstreetmap:200106300012050002e081fffec5333e
 # Nominatim servers
 
 +poldi.openstreetmap:193.63.75.101
 3poldi.openstreetmap:200106300012050002e081fffec5333e

-+nominatim.openstreetmap:193.63.75.101:600
-3nominatim.openstreetmap:200106300012050002e081fffec5333e:600
+#+nominatim.openstreetmap:193.63.75.101:600
+#3nominatim.openstreetmap:200106300012050002e081fffec5333e:600

 +poldi.ic.openstreetmap:146.179.159.164
 +poldi.oob.openstreetmap:146.179.159.186
 
 +poldi.ic.openstreetmap:146.179.159.164
 +poldi.oob.openstreetmap:146.179.159.186
 


@@ -111,6 +161,13 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 +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.ic.openstreetmap:146.179.159.179
+#+dulcy.oob.openstreetmap:
+

 # JXAPI server
 
 +norbert.openstreetmap:128.40.45.202
 # JXAPI server
 
 +norbert.openstreetmap:128.40.45.202


@@ -158,25 +215,35 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3backup.openstreetmap:2001063000120500022590fffec4f6ef
 +stats.openstreetmap:193.63.75.107
 3stats.openstreetmap:2001063000120500022590fffec4f6ef
 3backup.openstreetmap:2001063000120500022590fffec4f6ef
 +stats.openstreetmap:193.63.75.107
 3stats.openstreetmap:2001063000120500022590fffec4f6ef

-+planet.openstreetmap:193.63.75.107
-3planet.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.ic.openstreetmap:146.179.159.177
 +ironbelly.oob.openstreetmap:146.179.159.176
 +backup.ic.openstreetmap:146.179.159.177
 
 +ironbelly.ic.openstreetmap:146.179.159.177
 +ironbelly.oob.openstreetmap:146.179.159.176
 +backup.ic.openstreetmap:146.179.159.177
 

-# Database servers
++grisu.openstreetmap:89.16.162.20
+3grisu.openstreetmap:200141c9000200d60000000000000020
+#+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

 
 

-+smaug.ic.openstreetmap:146.179.159.168
-+smaug.oob.openstreetmap:146.179.159.182
+# Database servers

 
 

-+katla.ic.openstreetmap:146.179.159.173
-+db.ic.openstreetmap:146.179.159.173:600
-+katla.oob.openstreetmap:146.179.159.174
++katla.bm.openstreetmap:10.0.32.40
++db.bm.openstreetmap:10.0.32.40:600
++katla.oob.openstreetmap:10.0.33.40

 
 +ramoth.ic.openstreetmap:146.179.159.170
 +db-slave.ic.openstreetmap:146.179.159.170:600
 +ramoth.oob.openstreetmap:146.179.159.181
 
 
 +ramoth.ic.openstreetmap:146.179.159.170
 +db-slave.ic.openstreetmap:146.179.159.170:600
 +ramoth.oob.openstreetmap:146.179.159.181
 

++fafnir.openstreetmap:52.50.86.69
+

 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.45.196
 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.45.196


@@ -209,24 +276,21 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Imagery servers
 
 
 # Imagery servers
 

-+faffy.openstreetmap:128.40.45.198
-+agri.openstreetmap:128.40.45.198:3600
-+a.agri.openstreetmap:128.40.45.198:3600
-+b.agri.openstreetmap:128.40.45.198:3600
-+c.agri.openstreetmap:128.40.45.198:3600
-#+os.openstreetmap:128.40.45.198:3600
-#Ugly hack to use draco
++draco.openstreetmap:128.40.45.195

 +os.openstreetmap:128.40.45.195:3600
 +a.os.openstreetmap:128.40.45.195:3600
 +b.os.openstreetmap:128.40.45.195:3600
 +c.os.openstreetmap:128.40.45.195:3600
 +os.openstreetmap:128.40.45.195:3600
 +a.os.openstreetmap:128.40.45.195:3600
 +b.os.openstreetmap:128.40.45.195:3600
 +c.os.openstreetmap:128.40.45.195:3600

-+faffy.ucl.openstreetmap:10.0.0.7
-+faffy.oob.openstreetmap:10.0.1.7
-
-+draco.openstreetmap:128.40.45.195 

 +draco.ucl.openstreetmap:10.0.0.11
 +draco.oob.openstreetmap:10.0.1.11
 
 +draco.ucl.openstreetmap:10.0.0.11
 +draco.oob.openstreetmap:10.0.1.11
 

++kessie.openstreetmap:178.250.74.36
++agri.openstreetmap:178.250.74.36:3600
++a.agri.openstreetmap:178.250.74.36:3600
++b.agri.openstreetmap:178.250.74.36:3600
++c.agri.openstreetmap:178.250.74.36:3600
++kessie.oob.openstreetmap:178.250.74.37
+

 # Munin server
 
 +urmel.openstreetmap:128.40.45.207
 # Munin server
 
 +urmel.openstreetmap:128.40.45.207


@@ -280,27 +344,27 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Bytemark machine, and the services which operate from it
 
 
 # Bytemark machine, and the services which operate from it
 

-+shenron.openstreetmap:212.110.172.32:600
-+mail.openstreetmap:212.110.172.32:600
-+lists.openstreetmap:212.110.172.32:600
-+svn.openstreetmap:212.110.172.32:600
-+git.openstreetmap:212.110.172.32:600
-+trac.openstreetmap:212.110.172.32:600
-+irc.openstreetmap:212.110.172.32:600
-+help.openstreetmap:212.110.172.32:600
-+shop.openstreetmap:212.110.172.32:600
-+dns.openstreetmap:212.110.172.32:600
++shenron.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
++shop.openstreetmap:212.110.172.32
++dns.openstreetmap:212.110.172.32

 +shenron.bm.openstreetmap:10.0.16.3
 
 +shenron.bm.openstreetmap:10.0.16.3
 

-3shenron.openstreetmap:200141c9000104000000000000000032:600
-3mail.openstreetmap:200141c9000104000000000000000032:600
-3lists.openstreetmap:200141c9000104000000000000000032:600
-3svn.openstreetmap:200141c9000104000000000000000032:600
-3git.openstreetmap:200141c9000104000000000000000032:600
-3trac.openstreetmap:200141c9000104000000000000000032:600
-3help.openstreetmap:200141c9000104000000000000000032:600
-3shop.openstreetmap:200141c9000104000000000000000032:600
-3dns.openstreetmap:200141c9000104000000000000000032:600
+3shenron.openstreetmap:200141c9000104000000000000000032
+3mail.openstreetmap:200141c9000104000000000000000032
+3lists.openstreetmap:200141c9000104000000000000000032
+3svn.openstreetmap:200141c9000104000000000000000032
+3git.openstreetmap:200141c9000104000000000000000032
+3trac.openstreetmap:200141c9000104000000000000000032
+3help.openstreetmap:200141c9000104000000000000000032
+3shop.openstreetmap:200141c9000104000000000000000032
+3dns.openstreetmap:200141c9000104000000000000000032

 
 # Wiki server
 
 
 # Wiki server
 


@@ -325,10 +389,8 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Tile cache servers
 
 
 # Tile cache servers
 

-+fume.openstreetmap:85.30.190.241
-3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
-+fume.oob.openstreetmap:85.30.129.98

 +gorynych.openstreetmap:130.193.62.73
 +gorynych.openstreetmap:130.193.62.73

+3gorynych.openstreetmap:2a0206b8b0105065000000000000a001

 +lurien.openstreetmap:193.55.222.229
 +trogdor.openstreetmap:134.90.146.26
 +trogdor.oob.openstreetmap:134.90.146.30
 +lurien.openstreetmap:193.55.222.229
 +trogdor.openstreetmap:134.90.146.26
 +trogdor.oob.openstreetmap:134.90.146.30


@@ -349,18 +411,25 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3longma.openstreetmap:20010e10200002400000000000000007
 +viserion.openstreetmap:193.198.233.211
 3viserion.openstreetmap:20010b684cff00030000000000000003
 3longma.openstreetmap:20010e10200002400000000000000007
 +viserion.openstreetmap:193.198.233.211
 3viserion.openstreetmap:20010b684cff00030000000000000003

++drogon.openstreetmap:161.53.30.107
+3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4

 +saphira.openstreetmap:185.73.44.30
 3saphira.openstreetmap:20010ba800002c1e0000000000000000
 +saphira.openstreetmap:185.73.44.30
 3saphira.openstreetmap:20010ba800002c1e0000000000000000

++sarkany.openstreetmap:37.17.173.8
+3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81
++cmok.openstreetmap:31.130.201.40
+3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b

 
 # Blog aggregator (on Shaun McDonald's VM)
 
 
 # Blog aggregator (on Shaun McDonald's VM)
 

-+blogs.openstreetmap:89.16.175.12
++blogs.openstreetmap:213.138.110.209
+3blogs.openstreetmap:200141c8005105d1feff00fffe0032b8

 
 # Continuous integration server (on Shaun McDonald's machine)
 
 +ci.openstreetmap:144.76.98.136
 +cruise.openstreetmap:144.76.98.136
 
 # Continuous integration server (on Shaun McDonald's machine)
 
 +ci.openstreetmap:144.76.98.136
 +cruise.openstreetmap:144.76.98.136

- 
+

 # Donation site
 
 +donate.openstreetmap:46.43.50.94:600
 # Donation site
 
 +donate.openstreetmap:46.43.50.94:600