Point tile at konqi and albi instead of directly at yevaud

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 07f31c224702ad59407e2fd835426e9aa369870f..e4c9657dfe39438e49d0d0568cda14d157247cce 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -12,12 +12,14 @@
 
 @openstreetmap:89.16.179.150:a:10
 @openstreetmap::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmap:89.16.179.150:a:10
-@messages.openstreetmap:89.16.179.150:a:10
+@otrs.openstreetmap::a.mx.openstreetmap:10
+@messages.openstreetmap::a.mx.openstreetmap:10
+
+3a.mx.openstreetmap:200141c800100996021d7dfffec3df70
 
 # Publish an SPF record indicating that only shenron sends mail
 
-'openstreetmap:v=spf1 ip4\07289.16.179.150 ~all
+'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 
 # Main web servers and their aliases
 
@@ -79,16 +81,17 @@
 # Spare server
 
 +azure.openstreetmap:128.40.168.100
++jxapi.openstreetmap:128.40.168.100
 +azure.internal.openstreetmap:10.0.0.5
 +azure.ilo.openstreetmap:10.0.0.55
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap:128.40.168.104
-+tile.openstreetmap:128.40.168.104:3600
-+a.tile.openstreetmap:128.40.168.104:3600
-+b.tile.openstreetmap:128.40.168.104:3600
-+c.tile.openstreetmap:128.40.168.104:3600
++tile.openstreetmap:193.63.75.26:1800
++a.tile.openstreetmap:193.63.75.26:900
++b.tile.openstreetmap:128.40.168.95:900
++c.tile.openstreetmap:128.40.168.95:900
 +yevaud.internal.openstreetmap:10.0.0.15
 +yevaud.ilo.openstreetmap:10.0.0.65
 
@@ -96,6 +99,9 @@
 
 +horntail.openstreetmap:128.40.168.99
 +munin.openstreetmap:128.40.168.99
++apt.openstreetmap:128.40.168.99
++stats.openstreetmap:128.40.168.99
++chef.openstreetmap:128.40.168.99
 +backup.openstreetmap:10.0.0.7
 +horntail.internal.openstreetmap:10.0.0.7
 +horntail.ilo.openstreetmap:10.1.0.7
@@ -165,8 +171,19 @@
 +trac.openstreetmap:89.16.179.150
 +irc.openstreetmap:89.16.179.150
 +help.openstreetmap:89.16.179.150
++shop.openstreetmap:89.16.179.150
 +shenron.internal.openstreetmap:10.0.0.251
 
+3shenron.openstreetmap:200141c800100996021d7dfffec3df70
+3mail.openstreetmap:200141c800100996021d7dfffec3df70
+3lists.openstreetmap:200141c800100996021d7dfffec3df70
+3svn.openstreetmap:200141c800100996021d7dfffec3df70
+3git.openstreetmap:200141c800100996021d7dfffec3df70
+3trac.openstreetmap:200141c800100996021d7dfffec3df70
+3irc.openstreetmap:200141c800100996021d7dfffec3df70
+3help.openstreetmap:200141c800100996021d7dfffec3df70
+3shop.openstreetmap:200141c800100996021d7dfffec3df70
+
 # Wiki server
 
 +konqi.openstreetmap:193.63.75.26
@@ -175,6 +192,10 @@
 +wiki.openstreetmap:193.63.75.26
 +dump.wiki.openstreetmap:193.63.75.26
 
+# Tile cache server
+
++orm.openstreetmap:193.63.75.98
+
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap:89.16.175.12
@@ -187,10 +208,6 @@
 
 +donate.openstreetmap:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap:69.163.129.108