Set shenron DNS back to default TTL

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 63bc7cc4b385f4f2b35a611da73ae387d53b3154..644d1905037a7d32d4736b5fce3aba881272645f 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -13,27 +13,29 @@ 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:89.16.179.150:a:10
+@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
 

-3a.mx.openstreetmap:200141c800100996021d7dfffec3df70
+3a.mx.openstreetmap:200141c9000104000000000000000032

 
 # Publish an SPF record indicating that only shenron sends mail
 
 
 # Publish an SPF record indicating that only shenron sends mail
 

-'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~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:89.16.179.150:a.ns.openstreetmap
+&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
 # 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

-# bunyip.openstreetmap.org
-&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap

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


@@ -99,30 +101,44 @@ 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
 

-# Nominatim server
+# 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
++poldi.oob.openstreetmap:146.179.159.186
+
++pummelzacken.openstreetmap:128.40.45.204
++nominatim.openstreetmap:128.40.45.204:600
++pummelzacken.ucl.openstreetmap:10.0.0.20
++pummelzacken.oob.openstreetmap:10.0.1.20

 
 

-+poldi.openstreetmap:128.40.168.106 
-+nominatim.openstreetmap:128.40.168.106:3600
-+poldi.ucl.openstreetmap:10.0.0.16
-+poldi.oob.openstreetmap:10.0.1.16
++dulcy.openstreetmap:193.63.75.109
+3dulcy.openstreetmap:20010630001205000ec47afffe6696d2
++dulcy.ic.openstreetmap:146.179.159.179
+#+dulcy.oob.openstreetmap:

 
 # JXAPI server
 
 
 # JXAPI server
 

-+jxapi.openstreetmap:128.40.168.108:600
++norbert.openstreetmap:128.40.45.202
++jxapi.openstreetmap:128.40.45.202:600

 +norbert.ucl.openstreetmap:10.0.0.5
 +norbert.oob.openstreetmap:10.0.1.5
 
 # OWL server
 
 +norbert.ucl.openstreetmap:10.0.0.5
 +norbert.oob.openstreetmap:10.0.1.5
 
 # OWL server
 

-+zark.openstreetmap:128.40.168.107
-+owl.openstreetmap:128.40.168.107
++zark.openstreetmap:128.40.45.209
++owl.openstreetmap:128.40.45.209

 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
 # Taginfo server
 
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
 # Taginfo server
 

-+grindtooth.openstreetmap:128.40.168.100
-+taginfo.openstreetmap:128.40.168.100:600
++grindtooth.openstreetmap:128.40.45.199
+#+taginfo.openstreetmap:128.40.45.199:600
++taginfo.openstreetmap:140.211.167.104: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
 


@@ -132,7 +148,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 3orm.openstreetmap:200106300012050002e081fffec52a8c
 #+orm.ic.openstreetmap:10.0.16.2
 +orm.oob.openstreetmap:146.179.159.175
 3orm.openstreetmap:200106300012050002e081fffec52a8c
 #+orm.ic.openstreetmap:10.0.16.2
 +orm.oob.openstreetmap:146.179.159.175

-+yevaud.openstreetmap:128.40.168.104
++yevaud.openstreetmap:128.40.45.208

 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 Ctile.openstreetmap:tile.geo.openstreetmap.org
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 Ctile.openstreetmap:tile.geo.openstreetmap.org


@@ -153,92 +169,89 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3stats.openstreetmap:2001063000120500022590fffec4f6ef
 +planet.openstreetmap:193.63.75.107
 3planet.openstreetmap:2001063000120500022590fffec4f6ef
 3stats.openstreetmap:2001063000120500022590fffec4f6ef
 +planet.openstreetmap:193.63.75.107
 3planet.openstreetmap:2001063000120500022590fffec4f6ef

++logstash.openstreetmap:193.63.75.107
+3logstash.openstreetmap:2001063000120500022590fffec4f6ef

 +ironbelly.ic.openstreetmap:146.179.159.177
 +ironbelly.oob.openstreetmap:146.179.159.176
 +backup.ic.openstreetmap:146.179.159.177
 
 # Database servers
 
 +ironbelly.ic.openstreetmap:146.179.159.177
 +ironbelly.oob.openstreetmap:146.179.159.176
 +backup.ic.openstreetmap:146.179.159.177
 
 # Database servers
 

-+smaug.ic.openstreetmap:146.179.159.168
-+smaug.oob.openstreetmap:146.179.159.182
++katla.ic.openstreetmap:146.179.159.173
++db.ic.openstreetmap:146.179.159.173:600
++katla.oob.openstreetmap:146.179.159.174

 
 +ramoth.ic.openstreetmap:146.179.159.170
 
 +ramoth.ic.openstreetmap:146.179.159.170

-+db.ic.openstreetmap:146.179.159.170:600
++db-slave.ic.openstreetmap:146.179.159.170:600

 +ramoth.oob.openstreetmap:146.179.159.181
 
 +ramoth.oob.openstreetmap:146.179.159.181
 

-+katla.ic.openstreetmap:146.179.159.173
-+katla.oob.openstreetmap:146.179.159.174
-

 # Development server with wildcard alias for user sites
 
 # Development server with wildcard alias for user sites
 

-+errol.openstreetmap:128.40.168.103
-+dev.openstreetmap:128.40.168.103
-+*.dev.openstreetmap:128.40.168.103
-+ooc.openstreetmap:128.40.168.103
-+a.ooc.openstreetmap:128.40.168.103
-+b.ooc.openstreetmap:128.40.168.103
-+c.ooc.openstreetmap:128.40.168.103
-+npe.openstreetmap:128.40.168.103
++errol.openstreetmap:128.40.45.196
++dev.openstreetmap:128.40.45.196
++*.dev.openstreetmap:128.40.45.196
++ooc.openstreetmap:128.40.45.196
++a.ooc.openstreetmap:128.40.45.196
++b.ooc.openstreetmap:128.40.45.196
++c.ooc.openstreetmap:128.40.45.196
++npe.openstreetmap:128.40.45.196

 +errol.ucl.openstreetmap:10.0.0.14
 +errol.oob.openstreetmap:10.0.1.14
 
 # Foundation server
 
 +errol.ucl.openstreetmap:10.0.0.14
 +errol.oob.openstreetmap:10.0.1.14
 
 # Foundation server
 

-+ridley.openstreetmap:128.40.168.102
-+otrs.openstreetmap:128.40.168.102
-+thinkup.openstreetmap:128.40.168.102
-+blog.openstreetmap:128.40.168.102
-+foundation.openstreetmap:128.40.168.102
++ridley.openstreetmap:128.40.45.205
++otrs.openstreetmap:128.40.45.205
++thinkup.openstreetmap:128.40.45.205
++blog.openstreetmap:128.40.45.205
++foundation.openstreetmap:128.40.45.205

 +ridley.ucl.openstreetmap:10.0.0.3
 +ridley.oob.openstreetmap:10.0.1.3
 
 # Piwik server
 
 +ridley.ucl.openstreetmap:10.0.0.3
 +ridley.oob.openstreetmap:10.0.1.3
 
 # Piwik server
 

-+eustace.openstreetmap:128.40.168.101
-+piwik.openstreetmap:128.40.168.101
++eustace.openstreetmap:128.40.45.197
++piwik.openstreetmap:128.40.45.197

 +eustace.ucl.openstreetmap:10.0.0.9
 +eustace.oob.openstreetmap:10.0.1.9
 
 # Imagery servers
 
 +eustace.ucl.openstreetmap:10.0.0.9
 +eustace.oob.openstreetmap:10.0.1.9
 
 # Imagery servers
 

-+faffy.openstreetmap:128.40.168.108
-+agri.openstreetmap:128.40.168.108:3600
-+a.agri.openstreetmap:128.40.168.108:3600
-+b.agri.openstreetmap:128.40.168.108:3600
-+c.agri.openstreetmap:128.40.168.108:3600
-+os.openstreetmap:128.40.168.108:3600
-+a.os.openstreetmap:128.40.168.108:3600
-+b.os.openstreetmap:128.40.168.108:3600
-+c.os.openstreetmap:128.40.168.108:3600
-+faffy.ucl.openstreetmap:10.0.0.7
-+faffy.oob.openstreetmap:10.0.1.7
-
-+draco.openstreetmap:128.40.168.95 
++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

 +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
 

++grisu.openstreetmap:193.63.75.108
+3grisu.openstreetmap:2001063000120500dad385fffe5d87a0
++grisu.ic.openstreetmap:146.179.159.168
++grisu.oob.openstreetmap:146.179.159.182
+

 # Munin server
 
 # Munin server
 

-+urmel.openstreetmap:128.40.168.96
-+munin.openstreetmap:128.40.168.96:600
++urmel.openstreetmap:128.40.45.207
++munin.openstreetmap:128.40.45.207:600

 +urmel.ucl.openstreetmap:10.0.0.6
 +urmel.oob.openstreetmap:10.0.1.6
 
 # Gosmore routing server
 
 +urmel.ucl.openstreetmap:10.0.0.6
 +urmel.oob.openstreetmap:10.0.1.6
 
 # Gosmore routing server
 

-+sarel.openstreetmap:128.40.168.97
++sarel.openstreetmap:128.40.45.206

 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 
 # Forum server
 
 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 
 # Forum server
 

-+clifford.openstreetmap:128.40.168.98
++clifford.openstreetmap:128.40.45.194

 +clifford.ucl.openstreetmap:10.0.0.17
 +clifford.oob.openstreetmap:10.0.1.17
 
 # Loan machine for emacsen
 
 +clifford.ucl.openstreetmap:10.0.0.17
 +clifford.oob.openstreetmap:10.0.1.17
 
 # Loan machine for emacsen
 

-+ascalon.openstreetmap:128.40.168.105
++ascalon.openstreetmap:128.40.45.193

 +ascalon.ucl.openstreetmap:10.0.0.18
 +ascalon.oob.openstreetmap:10.0.1.18
 
 +ascalon.ucl.openstreetmap:10.0.0.18
 +ascalon.oob.openstreetmap:10.0.1.18
 


@@ -249,6 +262,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +idris.ucl.openstreetmap:10.0.0.4
 +idris.oob.openstreetmap:10.0.1.4
 
 +idris.ucl.openstreetmap:10.0.0.4
 +idris.oob.openstreetmap:10.0.1.4
 

+# KVMs
+
++kvm1.ucl.openstreetmap:10.0.0.21
+

 # APC power switches
 
 +apc1.ucl.openstreetmap:10.0.0.49
 # APC power switches
 
 +apc1.ucl.openstreetmap:10.0.0.49


@@ -262,31 +279,31 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Forum server
 
 
 # Forum server
 

-+forum.openstreetmap:93.186.179.231:600
++forum.openstreetmap:46.19.218.68:600

 
 # Bytemark machine, and the services which operate from it
 
 
 # Bytemark machine, and the services which operate from it
 

-+shenron.openstreetmap:89.16.179.150
-+mail.openstreetmap:89.16.179.150
-+lists.openstreetmap:89.16.179.150
-+svn.openstreetmap:89.16.179.150
-+git.openstreetmap:89.16.179.150
-+trac.openstreetmap:89.16.179.150
-+irc.openstreetmap:89.16.179.150
-+help.openstreetmap:89.16.179.150
-+shop.openstreetmap:89.16.179.150
-+dns.openstreetmap:89.16.179.150
++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:200141c800100996021d7dfffec3df70
-3mail.openstreetmap:200141c800100996021d7dfffec3df70
-3lists.openstreetmap:200141c800100996021d7dfffec3df70
-3svn.openstreetmap:200141c800100996021d7dfffec3df70
-3git.openstreetmap:200141c800100996021d7dfffec3df70
-3trac.openstreetmap:200141c800100996021d7dfffec3df70
-3help.openstreetmap:200141c800100996021d7dfffec3df70
-3shop.openstreetmap:200141c800100996021d7dfffec3df70
-3dns.openstreetmap:200141c800100996021d7dfffec3df70
+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
 


@@ -298,14 +315,14 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # GPS tile server
 
 
 # GPS tile server
 

-+noquiklos.openstreetmap:128.40.168.99
-+gps.tile.openstreetmap:128.40.168.99
-+gps-a.tile.openstreetmap:128.40.168.99
-+gps-b.tile.openstreetmap:128.40.168.99
-+gps-c.tile.openstreetmap:128.40.168.99
-+a.gps-tile.openstreetmap:128.40.168.99
-+b.gps-tile.openstreetmap:128.40.168.99
-+c.gps-tile.openstreetmap:128.40.168.99
++noquiklos.openstreetmap:128.40.45.201
++gps.tile.openstreetmap:128.40.45.201
++gps-a.tile.openstreetmap:128.40.45.201
++gps-b.tile.openstreetmap:128.40.45.201
++gps-c.tile.openstreetmap:128.40.45.201
++a.gps-tile.openstreetmap:128.40.45.201
++b.gps-tile.openstreetmap:128.40.45.201
++c.gps-tile.openstreetmap:128.40.45.201

 +noquiklos.ucl.openstreetmap:10.0.0.13
 +noquiklos.oob.openstreetmap:10.0.1.13
 
 +noquiklos.ucl.openstreetmap:10.0.0.13
 +noquiklos.oob.openstreetmap:10.0.1.13
 


@@ -315,27 +332,38 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
 +fume.oob.openstreetmap:85.30.129.98
 +gorynych.openstreetmap:130.193.62.73
 3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
 +fume.oob.openstreetmap:85.30.129.98
 +gorynych.openstreetmap:130.193.62.73

-+bunyip.openstreetmap:203.26.72.12
-3bunyip.openstreetmap:2402640000010006021708fffe5640c3
+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
 +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
-3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca
++jakelong.openstreetmap:64.62.205.202:600
+3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca:600

 +nepomuk.openstreetmap:77.95.70.166
 3nepomuk.openstreetmap:2a0391800001002100000000000000a6
 +simurgh.openstreetmap:94.20.20.55
 +nepomuk.openstreetmap:77.95.70.166
 3nepomuk.openstreetmap:2a0391800001002100000000000000a6
 +simurgh.openstreetmap:94.20.20.55

-
-+tabaluga.openstreetmap:5.9.150.236
-3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
++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
 +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
+3viserion.openstreetmap:20010b684cff00030000000000000003
++drogon.openstreetmap:161.53.30.107
+3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4
++saphira.openstreetmap:185.73.44.30
+3saphira.openstreetmap:20010ba800002c1e0000000000000000
++sarkany.openstreetmap:37.17.173.8
+3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81

 
 # 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)
 
 
 # Continuous integration server (on Shaun McDonald's machine)
 


@@ -357,7 +385,9 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +hot-staging.openstreetmap:144.76.31.210
 +hot-dev.openstreetmap:144.76.31.210
 
 +hot-staging.openstreetmap:144.76.31.210
 +hot-dev.openstreetmap:144.76.31.210
 

-# Jochen Topf's taginfo service, running on openstreetmap.de hardware
+# OSUOSL machines

 
 

-#+taginfo.openstreetmap:85.214.112.59:600
-#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600
++stormfly-01.openstreetmap:140.211.167.104
++stormfly-01.oob.openstreetmap:10.0.0.99
++stormfly-02.openstreetmap:140.211.167.105
++stormfly-02.oob.openstreetmap:10.0.0.108