# Nominatim servers
-+poldi.openstreetmap:128.40.45.203
-+nominatim.openstreetmap:128.40.45.203:3600
-+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
+pummelzacken.ucl.openstreetmap:10.0.0.20
+pummelzacken.oob.openstreetmap:10.0.1.20
# Taginfo server
+grindtooth.openstreetmap:128.40.45.199
-+taginfo.openstreetmap:128.40.45.199:600
+#+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
+smaug.ic.openstreetmap:146.179.159.168
+smaug.oob.openstreetmap:146.179.159.182
-+ramoth.ic.openstreetmap:146.179.159.170
-+db.ic.openstreetmap:146.179.159.170:600
-+ramoth.oob.openstreetmap:146.179.159.181
-
+katla.ic.openstreetmap:146.179.159.173
-+db-slave.ic.openstreetmap:146.179.159.173:600
++db.ic.openstreetmap:146.179.159.173:600
+katla.oob.openstreetmap:146.179.159.174
++ramoth.ic.openstreetmap:146.179.159.170
++db-slave.ic.openstreetmap:146.179.159.170:600
++ramoth.oob.openstreetmap:146.179.159.181
+
# Development server with wildcard alias for user sites
+errol.openstreetmap:128.40.45.196
# 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
+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
+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
3longma.openstreetmap:20010e10200002400000000000000007
++viserion.openstreetmap:193.198.233.211
+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)
+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