Add vote.osmfoundation.org site.

[dns.git] / openstreetmap.org

diff --git a/openstreetmap.org b/openstreetmap.org
index 40f006b940fd6562ddeb7253d6ba149d70dfda4d..1e4573b55d0da24ccf517d95b7c19ee097cbdeae 100644 (file)
--- a/openstreetmap.org
+++ b/openstreetmap.org
@@ -12,6 +12,8 @@
 
 @openstreetmap.org:89.16.177.88:a:10
 @openstreetmap.org::backup.mx.bytemark.co.uk:20
 
 @openstreetmap.org:89.16.177.88:a:10
 @openstreetmap.org::backup.mx.bytemark.co.uk:20

+@otrs.openstreetmap.org:89.16.177.88:a:10
+@messages.openstreetmap.org:89.16.177.88:a:10

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


@@ -19,12 +21,12 @@
 
 # Main web server and it's aliases
 
 
 # Main web server and it's aliases
 

-+puff.openstreetmap.org:128.40.58.203
-+openstreetmap.org:128.40.58.203
-+www.openstreetmap.org:128.40.58.203
-+api.openstreetmap.org:128.40.58.203
-+maps.openstreetmap.org:128.40.58.203
-+mapz.openstreetmap.org:128.40.58.203
++puff.openstreetmap.org:128.40.168.98
++openstreetmap.org:128.40.168.98
++www.openstreetmap.org:128.40.168.98
++api.openstreetmap.org:128.40.168.98
++maps.openstreetmap.org:128.40.168.98
++mapz.openstreetmap.org:128.40.168.98

 +puff.internal.openstreetmap.org:10.0.0.8
 +puff.ilo.openstreetmap.org:10.0.0.58
 
 +puff.internal.openstreetmap.org:10.0.0.8
 +puff.ilo.openstreetmap.org:10.0.0.58
 


@@ -42,24 +44,32 @@
 
 # Gazetteer server
 
 
 # Gazetteer server
 

-+gazetteer.openstreetmap.org:128.40.58.201
-+npe.openstreetmap.org:128.40.58.201
++gazetteer.openstreetmap.org:128.40.168.96

 +gazetteer.internal.openstreetmap.org:10.0.0.1
 
 # XAPI server
 
 +gazetteer.internal.openstreetmap.org:10.0.0.1
 
 # XAPI server
 

-+fafnir.openstreetmap.org:128.40.58.202
-+xapi.openstreetmap.org:128.40.58.202
++fafnir.openstreetmap.org:128.40.168.97
++xapi.openstreetmap.org:128.40.168.97

 +fafnir.internal.openstreetmap.org:10.0.0.4
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +fafnir.internal.openstreetmap.org:10.0.0.4
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 

-+tile.openstreetmap.org:128.40.58.204
-+a.tile.openstreetmap.org:128.40.58.204
-+b.tile.openstreetmap.org:128.40.58.204
-+c.tile.openstreetmap.org:128.40.58.204
-+tile.internal.openstreetmap.org:10.0.0.7
-+tile.ilo.openstreetmap.org:10.1.0.7
++yevaud.openstreetmap.org:128.40.168.104
++tile.openstreetmap.org:128.40.168.104
++a.tile.openstreetmap.org:128.40.168.104
++b.tile.openstreetmap.org:128.40.168.104
++c.tile.openstreetmap.org:128.40.168.104
++yevaud.internal.openstreetmap.org:10.0.0.15
++yevaud.ilo.openstreetmap.org:10.0.0.65
+
+# Services machine
+
++horntail.openstreetmap.org:128.40.168.99
++munin.openstreetmap.org:128.40.168.99
++backup.openstreetmap.org:10.0.0.7
++horntail.internal.openstreetmap.org:10.0.0.7
++horntail.ilo.openstreetmap.org:10.1.0.7

 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 


@@ -78,38 +88,51 @@
 +db.internal.openstreetmap.org:10.0.0.13:60
 +smaug.ilo.internal.openstreetmap.org:10.0.0.63
 
 +db.internal.openstreetmap.org:10.0.0.13:60
 +smaug.ilo.internal.openstreetmap.org:10.0.0.63
 

-# Backups are currently on tile
-
-+backup.openstreetmap.org:10.0.0.7
-

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

-+dev.openstreetmap.org:128.40.58.205
-+*.dev.openstreetmap.org:128.40.58.205
++old-dev.openstreetmap.org:128.40.168.100
++*.old-dev.openstreetmap.org:128.40.168.100

 +dev.internal.openstreetmap.org:10.0.0.5
 
 +dev.internal.openstreetmap.org:10.0.0.5
 

-# Planet dumps are currently served from dev
-
-+planet.openstreetmap.org:128.40.58.205
++errol.openstreetmap.org:128.40.168.103
++dev.openstreetmap.org:128.40.168.103
++*.dev.openstreetmap.org:128.40.168.103
++new-dev.openstreetmap.org:128.40.168.103
++*.new-dev.openstreetmap.org:128.40.168.103
++ooc.openstreetmap.org:128.40.168.103
++a.ooc.openstreetmap.org:128.40.168.103
++b.ooc.openstreetmap.org:128.40.168.103
++c.ooc.openstreetmap.org:128.40.168.103
++npe.openstreetmap.org:128.40.168.103
++errol.ilo.openstreetmap.org:10.0.0.64
+
+# Foundation server
+
++ridley.openstreetmap.org:128.40.168.102
++otrs.openstreetmap.org:128.40.168.102
++blog.openstreetmap.org:128.40.168.102
++foundation.openstreetmap.org:128.40.168.102
++ridley.internal.openstreetmap.org:10.0.0.3

 
 

-# Munin currently operates from gazetteer
+# Planet dumps are currently served from horntail

 
 

-+munin.openstreetmap.org:128.40.58.201
++planet.openstreetmap.org:128.40.168.99

 
 # Spare servers
 
 +fuchur.internal.openstreetmap.org:10.0.0.9
 +fuchur.ilo.openstreetmap.org:10.0.0.59
 +dulcy.internal.openstreetmap.org:10.0.0.2
 
 # Spare servers
 
 +fuchur.internal.openstreetmap.org:10.0.0.9
 +fuchur.ilo.openstreetmap.org:10.0.0.59
 +dulcy.internal.openstreetmap.org:10.0.0.2

-+ridley.internal.openstreetmap.org:10.0.0.3
++katie.openstreetmap.org:128.40.168.101

 +katie.internal.openstreetmap.org:10.0.0.6
 
 # APC power switch
 +katie.internal.openstreetmap.org:10.0.0.6
 
 # APC power switch

+

 +apc1.internal.openstreetmap.org:10.0.0.49
 
 # Forum server
 
 +apc1.internal.openstreetmap.org:10.0.0.49
 
 # Forum server
 

-+forum.openstreetmap.org:87.239.8.25
++forum.openstreetmap.org:93.186.179.231

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


@@ -125,8 +148,8 @@
 +svn.openstreetmap.org:89.16.177.88
 +trac.openstreetmap.org:89.16.177.88
 #+wiki.openstreetmap.org:89.16.177.88
 +svn.openstreetmap.org:89.16.177.88
 +trac.openstreetmap.org:89.16.177.88
 #+wiki.openstreetmap.org:89.16.177.88

-+foundation.openstreetmap.org:89.16.177.88

 +irc.openstreetmap.org:89.16.177.88
 +irc.openstreetmap.org:89.16.177.88

++idris.internal.openstreetmap.org:10.0.0.253

 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 
 
 # Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
 


@@ -135,6 +158,10 @@
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap.org:89.16.175.12
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap.org:89.16.175.12

+
+# Cruise (on Shaun McDonald's VM)
+
++cruise.openstreetmap.org:89.16.175.12

  
 # Donation site
 
  
 # Donation site