Replace smaug with grisu

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index f99f292c5357d6e6e1ae4a83f91eb5084c25083f..6abcaa02dd2e919a0c5d63ced8d15d9b31a51c47 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -24,6 +24,10 @@ 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
 
+# Add Google Postmaster Tools Verification
+# Grant
+Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com
+
 # Delegate geo.openstreetmap.org to PowerDNS
 
 # shenron.openstreetmap.org
@@ -99,10 +103,12 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # Nominatim servers
 
-+poldi.openstreetmap:128.40.45.203
-#+nominatim.openstreetmap:128.40.45.203:600
-+poldi.ucl.openstreetmap:10.0.0.16
-+poldi.oob.openstreetmap:10.0.1.16
++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
@@ -158,15 +164,14 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 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
 
-+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
@@ -207,24 +212,17 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # 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
-+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
 
++grisu.ic.openstreetmap:146.179.159.168
++grisu.oob.openstreetmap:146.179.159.182
+
 # Munin server
 
 +urmel.openstreetmap:128.40.45.207
@@ -257,6 +255,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +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
@@ -333,8 +335,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +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
 +longma.openstreetmap:140.110.240.7
@@ -343,10 +347,13 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 3viserion.openstreetmap:20010b684cff00030000000000000003
 +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)
 
-+blogs.openstreetmap:89.16.175.12
++blogs.openstreetmap:213.138.110.209
+3blogs.openstreetmap:200141c8005105d1feff00fffe0032b8
 
 # Continuous integration server (on Shaun McDonald's machine)
 
@@ -368,11 +375,6 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 +hot-staging.openstreetmap:144.76.31.210
 +hot-dev.openstreetmap:144.76.31.210
 
-# Jochen Topf's taginfo service, running on openstreetmap.de hardware
-
-#+taginfo.openstreetmap:85.214.112.59:600
-#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600
-
 # OSUOSL machines
 
 +stormfly-01.openstreetmap:140.211.167.104