Reorganise DNS files to get rid of duplication and use a makefile to

generate multiple variants of each zone.

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..d945c58
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+all: data/openstreetmap.org data/openstreetmap.com data/openstreetmap.net \
+     data/openstreetmaps.org data/osm.org \
+     data/osmfoundation.org data/stateofthemap.org data/stateofthemap.com
+
+clean:
+       rm data/*
+
+data/openstreetmap.org: src/openstreetmap
+data/openstreetmap.com: src/openstreetmap
+data/openstreetmap.net: src/openstreetmap
+data/openstreetmaps.org: src/openstreetmap
+data/osm.org: src/openstreetmap
+data/osmfoundation.org: src/osmfoundation
+data/stateofthemap.org: src/stateofthemap
+data/stateofthemap.com: src/stateofthemap
+
+data/%:
+       sed -e 's/$(notdir $<)/$(notdir $@)/g' < $< > $@

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
new file mode 100644 (file)
index 0000000..275eeee
--- /dev/null
+++ b/data/openstreetmap.com
@@ -0,0 +1,188 @@
+# tinydns data for openstreetmap.com
+#
+# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
+
+# Let Bytemark handle the DNS
+
+.openstreetmap.com::a.ns.bytemark.co.uk
+.openstreetmap.com::b.ns.bytemark.co.uk
+.openstreetmap.com::c.ns.bytemark.co.uk
+
+# Make the virtual machine the primary MX with Bytemark as backup
+
+@openstreetmap.com:89.16.177.88:a:10
+@openstreetmap.com::backup.mx.bytemark.co.uk:20
+@otrs.openstreetmap.com:89.16.177.88:a:10
+@messages.openstreetmap.com:89.16.177.88:a:10
+
+# Publish an SPF record indicating that only idris sends mail
+
+'openstreetmap.com:v=spf1 ip4\07289.16.177.88 ~all
+
+# Main web server and it's aliases
+
++puff.openstreetmap.com:128.40.168.98
++openstreetmap.com:128.40.168.98
++www.openstreetmap.com:128.40.168.98
++api.openstreetmap.com:128.40.168.98
++maps.openstreetmap.com:128.40.168.98
++mapz.openstreetmap.com:128.40.168.98
++puff.internal.openstreetmap.com:10.0.0.8
++puff.ilo.openstreetmap.com:10.0.0.58
+
+# Rails application servers
+
++draco.internal.openstreetmap.com:10.0.0.10
++rails1.internal.openstreetmap.com:10.0.0.10
++draco.ilo.openstreetmap.com:10.0.0.60
++sarel.internal.openstreetmap.com:10.0.0.11
++rails2.internal.openstreetmap.com:10.0.0.11
++sarel.ilo.openstreetmap.com:10.0.0.61
++norbert.internal.openstreetmap.com:10.0.0.12
++rails3.internal.openstreetmap.com:10.0.0.12
++norbert.ilo.openstreetmap.com:10.0.0.62
+
+# Gazetteer (nominatim) server
+
++katie.openstreetmap.com:128.40.168.101
++katie.internal.openstreetmap.com:10.0.0.6
++nominatim.openstreetmap.com:128.40.168.101
+
+# Gazetteer (namefinder) server
+
++gazetteer.openstreetmap.com:128.40.168.96
++gazetteer.internal.openstreetmap.com:10.0.0.1
+
+# XAPI server
+
++fafnir.openstreetmap.com:128.40.168.97
++xapi.openstreetmap.com:128.40.168.97
++fafnir.internal.openstreetmap.com:10.0.0.4
+
+# Mapnik tile server, with wildcard alias to allow parallel loading
+
++yevaud.openstreetmap.com:128.40.168.104
++tile.openstreetmap.com:128.40.168.104
++a.tile.openstreetmap.com:128.40.168.104
++b.tile.openstreetmap.com:128.40.168.104
++c.tile.openstreetmap.com:128.40.168.104
++yevaud.internal.openstreetmap.com:10.0.0.15
++yevaud.ilo.openstreetmap.com:10.0.0.65
+
+# Services machine
+
++horntail.openstreetmap.com:128.40.168.99
++munin.openstreetmap.com:128.40.168.99
++backup.openstreetmap.com:10.0.0.7
++horntail.internal.openstreetmap.com:10.0.0.7
++horntail.ilo.openstreetmap.com:10.1.0.7
+
+# Osmarender tile server, with wildcard alias to allow parallel loading
+
++tah.openstreetmap.com:129.132.168.206
++a.tah.openstreetmap.com:129.132.168.206
++b.tah.openstreetmap.com:129.132.168.206
++c.tah.openstreetmap.com:129.132.168.206
++d.tah.openstreetmap.com:129.132.168.206
++e.tah.openstreetmap.com:129.132.168.206
++f.tah.openstreetmap.com:129.132.168.206
++server.tah.openstreetmap.com:129.132.168.206
+
+# Database server
+
++smaug.internal.openstreetmap.com:10.0.0.13
++db.internal.openstreetmap.com:10.0.0.13:60
++smaug.ilo.internal.openstreetmap.com:10.0.0.63
+
+# Development server with wildcard alias for user sites
+
++old-dev.openstreetmap.com:128.40.168.100
++*.old-dev.openstreetmap.com:128.40.168.100
++old-dev.internal.openstreetmap.com:10.0.0.5
+
++errol.openstreetmap.com:128.40.168.103
++dev.openstreetmap.com:128.40.168.103
++*.dev.openstreetmap.com:128.40.168.103
++ooc.openstreetmap.com:128.40.168.103
++a.ooc.openstreetmap.com:128.40.168.103
++b.ooc.openstreetmap.com:128.40.168.103
++c.ooc.openstreetmap.com:128.40.168.103
++npe.openstreetmap.com:128.40.168.103
++os.openstreetmap.com:128.40.168.103
++a.os.openstreetmap.com:128.40.168.103
++b.os.openstreetmap.com:128.40.168.103
++c.os.openstreetmap.com:128.40.168.103
++errol.ilo.openstreetmap.com:10.0.0.64
+
+# Foundation server
+
++ridley.openstreetmap.com:128.40.168.102
++otrs.openstreetmap.com:128.40.168.102
++blog.openstreetmap.com:128.40.168.102
++foundation.openstreetmap.com:128.40.168.102
++ridley.internal.openstreetmap.com:10.0.0.3
+
+# Planet dumps are currently served from horntail
+
++planet.openstreetmap.com:128.40.168.99
+
+# Spare servers
+
++fuchur.openstreetmap.com:128.40.168.105
++fuchur.internal.openstreetmap.com:10.0.0.9
++fuchur.ilo.openstreetmap.com:10.0.0.59
++dulcy.internal.openstreetmap.com:10.0.0.2
+
+# APC power switch
+
++apc1.internal.openstreetmap.com:10.0.0.49
+
+# Forum server
+
++forum.openstreetmap.com:93.186.179.231
+
+# Bytemark virtual machine, and the services which operate from it
+
++vm.openstreetmap.com:80.68.94.95
++stats.wiki.openstreetmap.com:80.68.94.95
++vm.internal.openstreetmap.com:10.0.0.253
+
+# Bytemark atom machine, and the services which operate from it
+
++idris.openstreetmap.com:89.16.177.88
++mail.openstreetmap.com:89.16.177.88
++lists.openstreetmap.com:89.16.177.88
++svn.openstreetmap.com:89.16.177.88
++git.openstreetmap.com:89.16.177.88
++trac.openstreetmap.com:89.16.177.88
++irc.openstreetmap.com:89.16.177.88
++help.openstreetmap.com:89.16.177.88
++idris.internal.openstreetmap.com:10.0.0.253
+
+# Wiki server
+
++konqi.openstreetmap.com:193.63.75.26
++konqi.ilo.openstreetmap.com:193.63.75.27
++konqi.internal.openstreetmap.com:10.0.0.252
++wiki.openstreetmap.com:193.63.75.26
++dump.wiki.openstreetmap.com:193.63.75.26
+
+# Blog aggregator (on Shaun McDonald's VM)
+
++blogs.openstreetmap.com:89.16.175.12
+
+# Cruise (on Shaun McDonald's VM)
+
++cruise.openstreetmap.com:89.16.175.12
+ 
+# Donation site
+
++donate.openstreetmap.com:89.145.67.86
+
+# Our shop
+
+Cshop.openstreetmap.com:virtual.fotopic.net
+
+# HOT site
+
++hot.openstreetmap.com:69.163.129.108

diff --git a/data/openstreetmap.net b/data/openstreetmap.net
new file mode 100644 (file)
index 0000000..9aad93e
--- /dev/null
+++ b/data/openstreetmap.net
@@ -0,0 +1,188 @@
+# tinydns data for openstreetmap.net
+#
+# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
+
+# Let Bytemark handle the DNS
+
+.openstreetmap.net::a.ns.bytemark.co.uk
+.openstreetmap.net::b.ns.bytemark.co.uk
+.openstreetmap.net::c.ns.bytemark.co.uk
+
+# Make the virtual machine the primary MX with Bytemark as backup
+
+@openstreetmap.net:89.16.177.88:a:10
+@openstreetmap.net::backup.mx.bytemark.co.uk:20
+@otrs.openstreetmap.net:89.16.177.88:a:10
+@messages.openstreetmap.net:89.16.177.88:a:10
+
+# Publish an SPF record indicating that only idris sends mail
+
+'openstreetmap.net:v=spf1 ip4\07289.16.177.88 ~all
+
+# Main web server and it's aliases
+
++puff.openstreetmap.net:128.40.168.98
++openstreetmap.net:128.40.168.98
++www.openstreetmap.net:128.40.168.98
++api.openstreetmap.net:128.40.168.98
++maps.openstreetmap.net:128.40.168.98
++mapz.openstreetmap.net:128.40.168.98
++puff.internal.openstreetmap.net:10.0.0.8
++puff.ilo.openstreetmap.net:10.0.0.58
+
+# Rails application servers
+
++draco.internal.openstreetmap.net:10.0.0.10
++rails1.internal.openstreetmap.net:10.0.0.10
++draco.ilo.openstreetmap.net:10.0.0.60
++sarel.internal.openstreetmap.net:10.0.0.11
++rails2.internal.openstreetmap.net:10.0.0.11
++sarel.ilo.openstreetmap.net:10.0.0.61
++norbert.internal.openstreetmap.net:10.0.0.12
++rails3.internal.openstreetmap.net:10.0.0.12
++norbert.ilo.openstreetmap.net:10.0.0.62
+
+# Gazetteer (nominatim) server
+
++katie.openstreetmap.net:128.40.168.101
++katie.internal.openstreetmap.net:10.0.0.6
++nominatim.openstreetmap.net:128.40.168.101
+
+# Gazetteer (namefinder) server
+
++gazetteer.openstreetmap.net:128.40.168.96
++gazetteer.internal.openstreetmap.net:10.0.0.1
+
+# XAPI server
+
++fafnir.openstreetmap.net:128.40.168.97
++xapi.openstreetmap.net:128.40.168.97
++fafnir.internal.openstreetmap.net:10.0.0.4
+
+# Mapnik tile server, with wildcard alias to allow parallel loading
+
++yevaud.openstreetmap.net:128.40.168.104
++tile.openstreetmap.net:128.40.168.104
++a.tile.openstreetmap.net:128.40.168.104
++b.tile.openstreetmap.net:128.40.168.104
++c.tile.openstreetmap.net:128.40.168.104
++yevaud.internal.openstreetmap.net:10.0.0.15
++yevaud.ilo.openstreetmap.net:10.0.0.65
+
+# Services machine
+
++horntail.openstreetmap.net:128.40.168.99
++munin.openstreetmap.net:128.40.168.99
++backup.openstreetmap.net:10.0.0.7
++horntail.internal.openstreetmap.net:10.0.0.7
++horntail.ilo.openstreetmap.net:10.1.0.7
+
+# Osmarender tile server, with wildcard alias to allow parallel loading
+
++tah.openstreetmap.net:129.132.168.206
++a.tah.openstreetmap.net:129.132.168.206
++b.tah.openstreetmap.net:129.132.168.206
++c.tah.openstreetmap.net:129.132.168.206
++d.tah.openstreetmap.net:129.132.168.206
++e.tah.openstreetmap.net:129.132.168.206
++f.tah.openstreetmap.net:129.132.168.206
++server.tah.openstreetmap.net:129.132.168.206
+
+# Database server
+
++smaug.internal.openstreetmap.net:10.0.0.13
++db.internal.openstreetmap.net:10.0.0.13:60
++smaug.ilo.internal.openstreetmap.net:10.0.0.63
+
+# Development server with wildcard alias for user sites
+
++old-dev.openstreetmap.net:128.40.168.100
++*.old-dev.openstreetmap.net:128.40.168.100
++old-dev.internal.openstreetmap.net:10.0.0.5
+
++errol.openstreetmap.net:128.40.168.103
++dev.openstreetmap.net:128.40.168.103
++*.dev.openstreetmap.net:128.40.168.103
++ooc.openstreetmap.net:128.40.168.103
++a.ooc.openstreetmap.net:128.40.168.103
++b.ooc.openstreetmap.net:128.40.168.103
++c.ooc.openstreetmap.net:128.40.168.103
++npe.openstreetmap.net:128.40.168.103
++os.openstreetmap.net:128.40.168.103
++a.os.openstreetmap.net:128.40.168.103
++b.os.openstreetmap.net:128.40.168.103
++c.os.openstreetmap.net:128.40.168.103
++errol.ilo.openstreetmap.net:10.0.0.64
+
+# Foundation server
+
++ridley.openstreetmap.net:128.40.168.102
++otrs.openstreetmap.net:128.40.168.102
++blog.openstreetmap.net:128.40.168.102
++foundation.openstreetmap.net:128.40.168.102
++ridley.internal.openstreetmap.net:10.0.0.3
+
+# Planet dumps are currently served from horntail
+
++planet.openstreetmap.net:128.40.168.99
+
+# Spare servers
+
++fuchur.openstreetmap.net:128.40.168.105
++fuchur.internal.openstreetmap.net:10.0.0.9
++fuchur.ilo.openstreetmap.net:10.0.0.59
++dulcy.internal.openstreetmap.net:10.0.0.2
+
+# APC power switch
+
++apc1.internal.openstreetmap.net:10.0.0.49
+
+# Forum server
+
++forum.openstreetmap.net:93.186.179.231
+
+# Bytemark virtual machine, and the services which operate from it
+
++vm.openstreetmap.net:80.68.94.95
++stats.wiki.openstreetmap.net:80.68.94.95
++vm.internal.openstreetmap.net:10.0.0.253
+
+# Bytemark atom machine, and the services which operate from it
+
++idris.openstreetmap.net:89.16.177.88
++mail.openstreetmap.net:89.16.177.88
++lists.openstreetmap.net:89.16.177.88
++svn.openstreetmap.net:89.16.177.88
++git.openstreetmap.net:89.16.177.88
++trac.openstreetmap.net:89.16.177.88
++irc.openstreetmap.net:89.16.177.88
++help.openstreetmap.net:89.16.177.88
++idris.internal.openstreetmap.net:10.0.0.253
+
+# Wiki server
+
++konqi.openstreetmap.net:193.63.75.26
++konqi.ilo.openstreetmap.net:193.63.75.27
++konqi.internal.openstreetmap.net:10.0.0.252
++wiki.openstreetmap.net:193.63.75.26
++dump.wiki.openstreetmap.net:193.63.75.26
+
+# Blog aggregator (on Shaun McDonald's VM)
+
++blogs.openstreetmap.net:89.16.175.12
+
+# Cruise (on Shaun McDonald's VM)
+
++cruise.openstreetmap.net:89.16.175.12
+ 
+# Donation site
+
++donate.openstreetmap.net:89.145.67.86
+
+# Our shop
+
+Cshop.openstreetmap.net:virtual.fotopic.net
+
+# HOT site
+
++hot.openstreetmap.net:69.163.129.108

diff --git a/openstreetmap.org b/data/openstreetmap.org
similarity index 100%
rename from openstreetmap.org
rename to data/openstreetmap.org

diff --git a/openstreetmaps.org b/data/openstreetmaps.org
similarity index 86%
rename from openstreetmaps.org
rename to data/openstreetmaps.org
index 85daf06893c597bb76ca3b2e616fbcdc7832b1be..6f5204a4e90ca846e86766eacf71eb75f575b142 100644 (file)
--- a/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -13,6 +13,7 @@
 @openstreetmaps.org:89.16.177.88:a:10
 @openstreetmaps.org::backup.mx.bytemark.co.uk:20
 @otrs.openstreetmaps.org:89.16.177.88:a:10
+@messages.openstreetmaps.org:89.16.177.88:a:10
 
 # Publish an SPF record indicating that only idris sends mail
 
@@ -41,7 +42,13 @@
 +rails3.internal.openstreetmaps.org:10.0.0.12
 +norbert.ilo.openstreetmaps.org:10.0.0.62
 
-# Gazetteer server
+# Gazetteer (nominatim) server
+
++katie.openstreetmaps.org:128.40.168.101
++katie.internal.openstreetmaps.org:10.0.0.6
++nominatim.openstreetmaps.org:128.40.168.101
+
+# Gazetteer (namefinder) server
 
 +gazetteer.openstreetmaps.org:128.40.168.96
 +gazetteer.internal.openstreetmaps.org:10.0.0.1
@@ -91,18 +98,20 @@
 
 +old-dev.openstreetmaps.org:128.40.168.100
 +*.old-dev.openstreetmaps.org:128.40.168.100
-+dev.internal.openstreetmaps.org:10.0.0.5
++old-dev.internal.openstreetmaps.org:10.0.0.5
 
 +errol.openstreetmaps.org:128.40.168.103
 +dev.openstreetmaps.org:128.40.168.103
 +*.dev.openstreetmaps.org:128.40.168.103
-+new-dev.openstreetmaps.org:128.40.168.103
-+*.new-dev.openstreetmaps.org:128.40.168.103
 +ooc.openstreetmaps.org:128.40.168.103
 +a.ooc.openstreetmaps.org:128.40.168.103
 +b.ooc.openstreetmaps.org:128.40.168.103
 +c.ooc.openstreetmaps.org:128.40.168.103
 +npe.openstreetmaps.org:128.40.168.103
++os.openstreetmaps.org:128.40.168.103
++a.os.openstreetmaps.org:128.40.168.103
++b.os.openstreetmaps.org:128.40.168.103
++c.os.openstreetmaps.org:128.40.168.103
 +errol.ilo.openstreetmaps.org:10.0.0.64
 
 # Foundation server
@@ -119,11 +128,10 @@
 
 # Spare servers
 
++fuchur.openstreetmaps.org:128.40.168.105
 +fuchur.internal.openstreetmaps.org:10.0.0.9
 +fuchur.ilo.openstreetmaps.org:10.0.0.59
 +dulcy.internal.openstreetmaps.org:10.0.0.2
-+katie.openstreetmaps.org:128.40.168.101
-+katie.internal.openstreetmaps.org:10.0.0.6
 
 # APC power switch
 
@@ -145,14 +153,19 @@
 +mail.openstreetmaps.org:89.16.177.88
 +lists.openstreetmaps.org:89.16.177.88
 +svn.openstreetmaps.org:89.16.177.88
++git.openstreetmaps.org:89.16.177.88
 +trac.openstreetmaps.org:89.16.177.88
-#+wiki.openstreetmaps.org:89.16.177.88
 +irc.openstreetmaps.org:89.16.177.88
++help.openstreetmaps.org:89.16.177.88
 +idris.internal.openstreetmaps.org:10.0.0.253
 
-# Wiki is currently fronted by Grant's proxy (short timeout to allow changes)
+# Wiki server
 
-+wiki.openstreetmaps.org:89.145.68.232:3600
++konqi.openstreetmaps.org:193.63.75.26
++konqi.ilo.openstreetmaps.org:193.63.75.27
++konqi.internal.openstreetmaps.org:10.0.0.252
++wiki.openstreetmaps.org:193.63.75.26
++dump.wiki.openstreetmaps.org:193.63.75.26
 
 # Blog aggregator (on Shaun McDonald's VM)
 
@@ -169,3 +182,7 @@
 # Our shop
 
 Cshop.openstreetmaps.org:virtual.fotopic.net
+
+# HOT site
+
++hot.openstreetmaps.org:69.163.129.108

diff --git a/data/osm.org b/data/osm.org
new file mode 100644 (file)
index 0000000..1cbbc08
--- /dev/null
+++ b/data/osm.org
@@ -0,0 +1,188 @@
+# tinydns data for osm.org
+#
+# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
+
+# Let Bytemark handle the DNS
+
+.osm.org::a.ns.bytemark.co.uk
+.osm.org::b.ns.bytemark.co.uk
+.osm.org::c.ns.bytemark.co.uk
+
+# Make the virtual machine the primary MX with Bytemark as backup
+
+@osm.org:89.16.177.88:a:10
+@osm.org::backup.mx.bytemark.co.uk:20
+@otrs.osm.org:89.16.177.88:a:10
+@messages.osm.org:89.16.177.88:a:10
+
+# Publish an SPF record indicating that only idris sends mail
+
+'osm.org:v=spf1 ip4\07289.16.177.88 ~all
+
+# Main web server and it's aliases
+
++puff.osm.org:128.40.168.98
++osm.org:128.40.168.98
++www.osm.org:128.40.168.98
++api.osm.org:128.40.168.98
++maps.osm.org:128.40.168.98
++mapz.osm.org:128.40.168.98
++puff.internal.osm.org:10.0.0.8
++puff.ilo.osm.org:10.0.0.58
+
+# Rails application servers
+
++draco.internal.osm.org:10.0.0.10
++rails1.internal.osm.org:10.0.0.10
++draco.ilo.osm.org:10.0.0.60
++sarel.internal.osm.org:10.0.0.11
++rails2.internal.osm.org:10.0.0.11
++sarel.ilo.osm.org:10.0.0.61
++norbert.internal.osm.org:10.0.0.12
++rails3.internal.osm.org:10.0.0.12
++norbert.ilo.osm.org:10.0.0.62
+
+# Gazetteer (nominatim) server
+
++katie.osm.org:128.40.168.101
++katie.internal.osm.org:10.0.0.6
++nominatim.osm.org:128.40.168.101
+
+# Gazetteer (namefinder) server
+
++gazetteer.osm.org:128.40.168.96
++gazetteer.internal.osm.org:10.0.0.1
+
+# XAPI server
+
++fafnir.osm.org:128.40.168.97
++xapi.osm.org:128.40.168.97
++fafnir.internal.osm.org:10.0.0.4
+
+# Mapnik tile server, with wildcard alias to allow parallel loading
+
++yevaud.osm.org:128.40.168.104
++tile.osm.org:128.40.168.104
++a.tile.osm.org:128.40.168.104
++b.tile.osm.org:128.40.168.104
++c.tile.osm.org:128.40.168.104
++yevaud.internal.osm.org:10.0.0.15
++yevaud.ilo.osm.org:10.0.0.65
+
+# Services machine
+
++horntail.osm.org:128.40.168.99
++munin.osm.org:128.40.168.99
++backup.osm.org:10.0.0.7
++horntail.internal.osm.org:10.0.0.7
++horntail.ilo.osm.org:10.1.0.7
+
+# Osmarender tile server, with wildcard alias to allow parallel loading
+
++tah.osm.org:129.132.168.206
++a.tah.osm.org:129.132.168.206
++b.tah.osm.org:129.132.168.206
++c.tah.osm.org:129.132.168.206
++d.tah.osm.org:129.132.168.206
++e.tah.osm.org:129.132.168.206
++f.tah.osm.org:129.132.168.206
++server.tah.osm.org:129.132.168.206
+
+# Database server
+
++smaug.internal.osm.org:10.0.0.13
++db.internal.osm.org:10.0.0.13:60
++smaug.ilo.internal.osm.org:10.0.0.63
+
+# Development server with wildcard alias for user sites
+
++old-dev.osm.org:128.40.168.100
++*.old-dev.osm.org:128.40.168.100
++old-dev.internal.osm.org:10.0.0.5
+
++errol.osm.org:128.40.168.103
++dev.osm.org:128.40.168.103
++*.dev.osm.org:128.40.168.103
++ooc.osm.org:128.40.168.103
++a.ooc.osm.org:128.40.168.103
++b.ooc.osm.org:128.40.168.103
++c.ooc.osm.org:128.40.168.103
++npe.osm.org:128.40.168.103
++os.osm.org:128.40.168.103
++a.os.osm.org:128.40.168.103
++b.os.osm.org:128.40.168.103
++c.os.osm.org:128.40.168.103
++errol.ilo.osm.org:10.0.0.64
+
+# Foundation server
+
++ridley.osm.org:128.40.168.102
++otrs.osm.org:128.40.168.102
++blog.osm.org:128.40.168.102
++foundation.osm.org:128.40.168.102
++ridley.internal.osm.org:10.0.0.3
+
+# Planet dumps are currently served from horntail
+
++planet.osm.org:128.40.168.99
+
+# Spare servers
+
++fuchur.osm.org:128.40.168.105
++fuchur.internal.osm.org:10.0.0.9
++fuchur.ilo.osm.org:10.0.0.59
++dulcy.internal.osm.org:10.0.0.2
+
+# APC power switch
+
++apc1.internal.osm.org:10.0.0.49
+
+# Forum server
+
++forum.osm.org:93.186.179.231
+
+# Bytemark virtual machine, and the services which operate from it
+
++vm.osm.org:80.68.94.95
++stats.wiki.osm.org:80.68.94.95
++vm.internal.osm.org:10.0.0.253
+
+# Bytemark atom machine, and the services which operate from it
+
++idris.osm.org:89.16.177.88
++mail.osm.org:89.16.177.88
++lists.osm.org:89.16.177.88
++svn.osm.org:89.16.177.88
++git.osm.org:89.16.177.88
++trac.osm.org:89.16.177.88
++irc.osm.org:89.16.177.88
++help.osm.org:89.16.177.88
++idris.internal.osm.org:10.0.0.253
+
+# Wiki server
+
++konqi.osm.org:193.63.75.26
++konqi.ilo.osm.org:193.63.75.27
++konqi.internal.osm.org:10.0.0.252
++wiki.osm.org:193.63.75.26
++dump.wiki.osm.org:193.63.75.26
+
+# Blog aggregator (on Shaun McDonald's VM)
+
++blogs.osm.org:89.16.175.12
+
+# Cruise (on Shaun McDonald's VM)
+
++cruise.osm.org:89.16.175.12
+ 
+# Donation site
+
++donate.osm.org:89.145.67.86
+
+# Our shop
+
+Cshop.osm.org:virtual.fotopic.net
+
+# HOT site
+
++hot.osm.org:69.163.129.108

diff --git a/osmfoundation.org b/data/osmfoundation.org
similarity index 100%
rename from osmfoundation.org
rename to data/osmfoundation.org

diff --git a/stateofthemap.com b/data/stateofthemap.com
similarity index 95%
rename from stateofthemap.com
rename to data/stateofthemap.com
index f96c1a26293b4a5882c51188da107cd982a1d4fe..5b65cf4d32a2a534d566897d84acdd3fb0c39e5a 100644 (file)
--- a/stateofthemap.com
+++ b/data/stateofthemap.com
@@ -24,6 +24,7 @@ Clogin.stateofthemap.com:ghs.google.com
 
 +stateofthemap.com:128.40.168.102
 +www.stateofthemap.com:128.40.168.102
++2010.stateofthemap.com:128.40.168.102
 +2009.stateofthemap.com:128.40.168.102
 +2008.stateofthemap.com:128.40.168.102
 +2007.stateofthemap.com:128.40.168.102

diff --git a/stateofthemap.org b/data/stateofthemap.org
similarity index 100%
rename from stateofthemap.org
rename to data/stateofthemap.org

diff --git a/openstreetmap.com b/openstreetmap.com
deleted file mode 100644 (file)
index 38a167f..0000000
--- a/openstreetmap.com
+++ /dev/null
@@ -1,33 +0,0 @@
-# tinydns data for openstreetmap.com
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.openstreetmap.com::a.ns.bytemark.co.uk
-.openstreetmap.com::b.ns.bytemark.co.uk
-.openstreetmap.com::c.ns.bytemark.co.uk
-
-# Make the virtual machine the primary MX with Bytemark as backup
-
-@openstreetmap.com:89.16.177.88:a:10
-@openstreetmap.com::backup.mx.bytemark.co.uk:20
-
-# Main web server and it's aliases
-
-+openstreetmap.com:128.40.168.98
-+www.openstreetmap.com:128.40.168.98
-
-# Bytemark atom machine, and the services which operate from it
-
-+mail.openstreetmap.com:89.16.177.88
-+lists.openstreetmap.com:89.16.177.88
-+svn.openstreetmap.com:89.16.177.88
-+trac.openstreetmap.com:89.16.177.88
-+wiki.openstreetmap.com:89.16.177.88
-+foundation.openstreetmap.com:89.16.177.88
-+irc.openstreetmap.com:89.16.177.88
-
-# Donation site
-
-+donate.openstreetmap.com:89.145.67.86

diff --git a/openstreetmap.net b/openstreetmap.net
deleted file mode 100644 (file)
index e73b33a..0000000
--- a/openstreetmap.net
+++ /dev/null
@@ -1,34 +0,0 @@
-# tinydns data for openstreetmap.net
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.openstreetmap.net::a.ns.bytemark.co.uk
-.openstreetmap.net::b.ns.bytemark.co.uk
-.openstreetmap.net::c.ns.bytemark.co.uk
-
-# Make the virtual machine the primary MX with Bytemark as backup
-
-@openstreetmap.net:89.16.177.88:a:10
-@openstreetmap.net::backup.mx.bytemark.co.uk:20
-
-# Main web server and it's aliases
-
-+openstreetmap.net:128.40.168.98
-+www.openstreetmap.net:128.40.168.98
-
-# Bytemark atom machine, and the services which operate from it
-
-+mail.openstreetmap.net:89.16.177.88
-+lists.openstreetmap.net:89.16.177.88
-+svn.openstreetmap.net:89.16.177.88
-+trac.openstreetmap.net:89.16.177.88
-+wiki.openstreetmap.net:89.16.177.88
-+foundation.openstreetmap.net:89.16.177.88
-+irc.openstreetmap.net:89.16.177.88
-
-#
-# Donation site
-
-+donate.openstreetmap.net:89.145.67.86

diff --git a/osm.org b/osm.org
deleted file mode 100644 (file)
index 386bcc3..0000000
--- a/osm.org
+++ /dev/null
@@ -1,61 +0,0 @@
-# tinydns data for osm.org
-#
-# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
-
-# Let Bytemark handle the DNS
-
-.osm.org::a.ns.bytemark.co.uk
-.osm.org::b.ns.bytemark.co.uk
-.osm.org::c.ns.bytemark.co.uk
-
-# Make the virtual machine the primary MX with Bytemark as backup
-
-@osm.org:89.16.177.88:a:10
-@osm.org::backup.mx.bytemark.co.uk:20
-
-# Main web server and it's aliases
-
-+osm.org:128.40.168.98
-+www.osm.org:128.40.168.98
-
-# Services machine
-
-+munin.osm.org:128.40.168.99
-
-# Foundation server
-
-+otrs.osm.org:128.40.168.102
-+blog.osm.org:128.40.168.102
-+foundation.osm.org:128.40.168.102
-
-# Planet dumps are currently served from horntail
-
-+planet.osm.org:128.40.168.99
-
-# Bytemark atom machine, and the services which operate from it
-
-+mail.osm.org:89.16.177.88
-+lists.osm.org:89.16.177.88
-+svn.osm.org:89.16.177.88
-+git.osm.org:89.16.177.88
-+trac.osm.org:89.16.177.88
-+foundation.osm.org:89.16.177.88
-+irc.osm.org:89.16.177.88
-+help.osm.org:89.16.177.88
-
-# Wiki server
-
-+wiki.osm.org:193.63.75.26
-+dump.wiki.osm.org:193.63.75.26
-
-# Blog aggregator (on Shaun McDonald's VM)
-
-+blogs.osm.org:89.16.175.12
-
-# Cruise (on Shaun McDonald's VM)
-
-+cruise.osm.org:89.16.175.12
-
-# Donation site
-
-+donate.osm.org:89.145.67.86

diff --git a/src/openstreetmap b/src/openstreetmap
new file mode 100644 (file)
index 0000000..02d3ce1
--- /dev/null
+++ b/src/openstreetmap
@@ -0,0 +1,188 @@
+# tinydns data for openstreetmap
+#
+# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
+
+# Let Bytemark handle the DNS
+
+.openstreetmap::a.ns.bytemark.co.uk
+.openstreetmap::b.ns.bytemark.co.uk
+.openstreetmap::c.ns.bytemark.co.uk
+
+# Make the virtual machine the primary MX with Bytemark as backup
+
+@openstreetmap:89.16.177.88:a:10
+@openstreetmap::backup.mx.bytemark.co.uk:20
+@otrs.openstreetmap:89.16.177.88:a:10
+@messages.openstreetmap:89.16.177.88:a:10
+
+# Publish an SPF record indicating that only idris sends mail
+
+'openstreetmap:v=spf1 ip4\07289.16.177.88 ~all
+
+# Main web server and it's aliases
+
++puff.openstreetmap:128.40.168.98
++openstreetmap:128.40.168.98
++www.openstreetmap:128.40.168.98
++api.openstreetmap:128.40.168.98
++maps.openstreetmap:128.40.168.98
++mapz.openstreetmap:128.40.168.98
++puff.internal.openstreetmap:10.0.0.8
++puff.ilo.openstreetmap:10.0.0.58
+
+# Rails application servers
+
++draco.internal.openstreetmap:10.0.0.10
++rails1.internal.openstreetmap:10.0.0.10
++draco.ilo.openstreetmap:10.0.0.60
++sarel.internal.openstreetmap:10.0.0.11
++rails2.internal.openstreetmap:10.0.0.11
++sarel.ilo.openstreetmap:10.0.0.61
++norbert.internal.openstreetmap:10.0.0.12
++rails3.internal.openstreetmap:10.0.0.12
++norbert.ilo.openstreetmap:10.0.0.62
+
+# Gazetteer (nominatim) server
+
++katie.openstreetmap:128.40.168.101
++katie.internal.openstreetmap:10.0.0.6
++nominatim.openstreetmap:128.40.168.101
+
+# Gazetteer (namefinder) server
+
++gazetteer.openstreetmap:128.40.168.96
++gazetteer.internal.openstreetmap:10.0.0.1
+
+# XAPI server
+
++fafnir.openstreetmap:128.40.168.97
++xapi.openstreetmap:128.40.168.97
++fafnir.internal.openstreetmap:10.0.0.4
+
+# Mapnik tile server, with wildcard alias to allow parallel loading
+
++yevaud.openstreetmap:128.40.168.104
++tile.openstreetmap:128.40.168.104
++a.tile.openstreetmap:128.40.168.104
++b.tile.openstreetmap:128.40.168.104
++c.tile.openstreetmap:128.40.168.104
++yevaud.internal.openstreetmap:10.0.0.15
++yevaud.ilo.openstreetmap:10.0.0.65
+
+# Services machine
+
++horntail.openstreetmap:128.40.168.99
++munin.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
+
+# Osmarender tile server, with wildcard alias to allow parallel loading
+
++tah.openstreetmap:129.132.168.206
++a.tah.openstreetmap:129.132.168.206
++b.tah.openstreetmap:129.132.168.206
++c.tah.openstreetmap:129.132.168.206
++d.tah.openstreetmap:129.132.168.206
++e.tah.openstreetmap:129.132.168.206
++f.tah.openstreetmap:129.132.168.206
++server.tah.openstreetmap:129.132.168.206
+
+# Database server
+
++smaug.internal.openstreetmap:10.0.0.13
++db.internal.openstreetmap:10.0.0.13:60
++smaug.ilo.internal.openstreetmap:10.0.0.63
+
+# Development server with wildcard alias for user sites
+
++old-dev.openstreetmap:128.40.168.100
++*.old-dev.openstreetmap:128.40.168.100
++old-dev.internal.openstreetmap:10.0.0.5
+
++errol.openstreetmap:128.40.168.103
++dev.openstreetmap:128.40.168.103
++*.dev.openstreetmap:128.40.168.103
++ooc.openstreetmap:128.40.168.103
++a.ooc.openstreetmap:128.40.168.103
++b.ooc.openstreetmap:128.40.168.103
++c.ooc.openstreetmap:128.40.168.103
++npe.openstreetmap:128.40.168.103
++os.openstreetmap:128.40.168.103
++a.os.openstreetmap:128.40.168.103
++b.os.openstreetmap:128.40.168.103
++c.os.openstreetmap:128.40.168.103
++errol.ilo.openstreetmap:10.0.0.64
+
+# Foundation server
+
++ridley.openstreetmap:128.40.168.102
++otrs.openstreetmap:128.40.168.102
++blog.openstreetmap:128.40.168.102
++foundation.openstreetmap:128.40.168.102
++ridley.internal.openstreetmap:10.0.0.3
+
+# Planet dumps are currently served from horntail
+
++planet.openstreetmap:128.40.168.99
+
+# Spare servers
+
++fuchur.openstreetmap:128.40.168.105
++fuchur.internal.openstreetmap:10.0.0.9
++fuchur.ilo.openstreetmap:10.0.0.59
++dulcy.internal.openstreetmap:10.0.0.2
+
+# APC power switch
+
++apc1.internal.openstreetmap:10.0.0.49
+
+# Forum server
+
++forum.openstreetmap:93.186.179.231
+
+# Bytemark virtual machine, and the services which operate from it
+
++vm.openstreetmap:80.68.94.95
++stats.wiki.openstreetmap:80.68.94.95
++vm.internal.openstreetmap:10.0.0.253
+
+# Bytemark atom machine, and the services which operate from it
+
++idris.openstreetmap:89.16.177.88
++mail.openstreetmap:89.16.177.88
++lists.openstreetmap:89.16.177.88
++svn.openstreetmap:89.16.177.88
++git.openstreetmap:89.16.177.88
++trac.openstreetmap:89.16.177.88
++irc.openstreetmap:89.16.177.88
++help.openstreetmap:89.16.177.88
++idris.internal.openstreetmap:10.0.0.253
+
+# Wiki server
+
++konqi.openstreetmap:193.63.75.26
++konqi.ilo.openstreetmap:193.63.75.27
++konqi.internal.openstreetmap:10.0.0.252
++wiki.openstreetmap:193.63.75.26
++dump.wiki.openstreetmap:193.63.75.26
+
+# Blog aggregator (on Shaun McDonald's VM)
+
++blogs.openstreetmap:89.16.175.12
+
+# Cruise (on Shaun McDonald's VM)
+
++cruise.openstreetmap:89.16.175.12
+ 
+# Donation site
+
++donate.openstreetmap:89.145.67.86
+
+# Our shop
+
+Cshop.openstreetmap:virtual.fotopic.net
+
+# HOT site
+
++hot.openstreetmap:69.163.129.108

diff --git a/src/osmfoundation b/src/osmfoundation
new file mode 100644 (file)
index 0000000..876eea4
--- /dev/null
+++ b/src/osmfoundation
@@ -0,0 +1,36 @@
+# tinydns data for osmfoundation
+#
+# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
+
+# Let Bytemark handle the DNS
+
+.osmfoundation::a.ns.bytemark.co.uk
+.osmfoundation::b.ns.bytemark.co.uk
+.osmfoundation::c.ns.bytemark.co.uk
+
+# SPF Record
+
+'osmfoundation:v=spf1 a\072idris.openstreetmap.org include\072aspmx.googlemail.com ~all:3600
+
+# Let google handle email
+
+@osmfoundation::aspmx.l.google.com:1:3600
+@osmfoundation::alt1.aspmx.l.google.com:5:3600
+@osmfoundation::alt2.aspmx.l.google.com:5:3600
+@osmfoundation::aspmx2.googlemail.com:10:3600
+@osmfoundation::aspmx3.googlemail.com:10:3600
+
+# Alias for login
+
+Clogin.osmfoundation:ghs.google.com
+
+# Main web server and it's aliases
+
++osmfoundation:128.40.168.102
++old.osmfoundation:128.40.168.102
++www.osmfoundation:128.40.168.102
++wiki.osmfoundation:128.40.168.102
++blog.osmfoundation:128.40.168.102
++vote.osmfoundation:128.40.168.102
++accounts.osmfoundation:128.40.168.102
+Cdocs.osmfoundation:ghs.google.com

diff --git a/src/stateofthemap b/src/stateofthemap
new file mode 100644 (file)
index 0000000..dd931ba
--- /dev/null
+++ b/src/stateofthemap
@@ -0,0 +1,30 @@
+# tinydns data for stateofthemap
+#
+# Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
+
+# Let Bytemark handle the DNS
+
+.stateofthemap::a.ns.bytemark.co.uk
+.stateofthemap::b.ns.bytemark.co.uk
+.stateofthemap::c.ns.bytemark.co.uk
+
+# Let google handle email
+
+@stateofthemap::aspmx.l.google.com:1:3600
+@stateofthemap::alt1.aspmx.l.google.com:5:3600
+@stateofthemap::alt2.aspmx.l.google.com:5:3600
+@stateofthemap::aspmx2.googlemail.com:10:3600
+@stateofthemap::aspmx3.googlemail.com:10:3600
+
+# Alias for login
+
+Clogin.stateofthemap:ghs.google.com
+
+# Main web server and it's aliases
+
++stateofthemap:128.40.168.102
++www.stateofthemap:128.40.168.102
++2010.stateofthemap:128.40.168.102
++2009.stateofthemap:128.40.168.102
++2008.stateofthemap:128.40.168.102
++2007.stateofthemap:128.40.168.102