Move shop to point at a vhost that redirects to the wiki

[dns.git] / data / openstreetmaps.org

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index b183ae757811ec95c9a887bfb0611e6fd7643dc6..4b48bac13674f9499fca225c1c7956c7613436fe 100644 (file)
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -12,10 +12,10 @@
 
 @openstreetmaps.org:89.16.179.150:a:10
 @openstreetmaps.org::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmaps.org::a.mx.openstreetmaps.org.org:10
-@messages.openstreetmaps.org::a.mx.openstreetmaps.org.org:10
+@otrs.openstreetmaps.org::a.mx.openstreetmaps.org:10
+@messages.openstreetmaps.org::a.mx.openstreetmaps.org:10
 
-3:a.mx.openstreetmaps.org.org:200141c800100996021d7dfffec3df70
+3a.mx.openstreetmaps.org:200141c800100996021d7dfffec3df70
 
 # Publish an SPF record indicating that only shenron sends mail
 
@@ -167,6 +167,7 @@
 +trac.openstreetmaps.org:89.16.179.150
 +irc.openstreetmaps.org:89.16.179.150
 +help.openstreetmaps.org:89.16.179.150
++shop.openstreetmaps.org:89.16.179.150
 +shenron.internal.openstreetmaps.org:10.0.0.251
 
 3shenron.openstreetmaps.org:200141c800100996021d7dfffec3df70
@@ -177,6 +178,7 @@
 3trac.openstreetmaps.org:200141c800100996021d7dfffec3df70
 3irc.openstreetmaps.org:200141c800100996021d7dfffec3df70
 3help.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3shop.openstreetmaps.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -186,6 +188,10 @@
 +wiki.openstreetmaps.org:193.63.75.26
 +dump.wiki.openstreetmaps.org:193.63.75.26
 
+# Tile cache server
+
++orm.openstreetmaps.org:193.63.75.98
+
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmaps.org:89.16.175.12
@@ -198,10 +204,6 @@
 
 +donate.openstreetmaps.org:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmaps.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmaps.org:69.163.129.108