Merge remote-tracking branch 'github/pull/710'

[chef.git] / cookbooks / bind / templates / default / db.10.erb

diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb
index 55c99e6f68d9c62649eba9ed8e797cc051405290..d0b87436011c1d87757b233427e293bb11179800 100644 (file)
--- a/cookbooks/bind/templates/default/db.10.erb
+++ b/cookbooks/bind/templates/default/db.10.erb
@@ -12,78 +12,25 @@ $TTL        604800
 
 3.0.0          IN      PTR     ridley.ucl.openstreetmap.org.
 4.0.0          IN      PTR     snap-02.ucl.openstreetmap.org.
-5.0.0          IN      PTR     norbert.ucl.openstreetmap.org.
-6.0.0          IN      PTR     urmel.ucl.openstreetmap.org.
-7.0.0          IN      PTR     faffy.ucl.openstreetmap.org.
-8.0.0          IN      PTR     zark.ucl.openstreetmap.org.
-9.0.0          IN      PTR     eustace.ucl.openstreetmap.org.
 10.0.0         IN      PTR     eddie.ucl.openstreetmap.org.
-11.0.0         IN      PTR     draco.ucl.openstreetmap.org.
 12.0.0         IN      PTR     sarel.ucl.openstreetmap.org.
 13.0.0         IN      PTR     noquiklos.ucl.openstreetmap.org.
-14.0.0         IN      PTR     errol.ucl.openstreetmap.org.
 15.0.0         IN      PTR     ysera.ucl.openstreetmap.org.
 17.0.0         IN      PTR     clifford.ucl.openstreetmap.org.
-19.0.0         IN      PTR     grindtooth.ucl.openstreetmap.org.
 20.0.0         IN      PTR     pummelzacken.ucl.openstreetmap.org.
-40.0.0         IN      PTR     tiamat-00.ucl.openstreetmap.org.
-41.0.0         IN      PTR     tiamat-01.ucl.openstreetmap.org.
-42.0.0         IN      PTR     tiamat-02.ucl.openstreetmap.org.
-43.0.0         IN      PTR     tiamat-03.ucl.openstreetmap.org.
-44.0.0         IN      PTR     tiamat-10.ucl.openstreetmap.org.
-45.0.0         IN      PTR     tiamat-11.ucl.openstreetmap.org.
-46.0.0         IN      PTR     tiamat-12.ucl.openstreetmap.org.
-47.0.0         IN      PTR     tiamat-13.ucl.openstreetmap.org.
-48.0.0         IN      PTR     tiamat-20.ucl.openstreetmap.org.
-49.0.0         IN      PTR     tiamat-21.ucl.openstreetmap.org.
-50.0.0         IN      PTR     tiamat-22.ucl.openstreetmap.org.
-51.0.0         IN      PTR     tiamat-23.ucl.openstreetmap.org.
 
 3.1.0          IN      PTR     ridley.oob.openstreetmap.org.
 4.1.0          IN      PTR     snap-02.oob.openstreetmap.org.
-5.1.0          IN      PTR     norbert.oob.openstreetmap.org.
-6.1.0          IN      PTR     urmel.oob.openstreetmap.org.
-8.1.0          IN      PTR     zark.oob.openstreetmap.org.
-9.1.0          IN      PTR     eustace.oob.openstreetmap.org.
 10.1.0         IN      PTR     eddie.oob.openstreetmap.org.
-11.1.0         IN      PTR     draco.oob.openstreetmap.org.
 12.1.0         IN      PTR     sarel.oob.openstreetmap.org.
 13.1.0         IN      PTR     noquiklos.oob.openstreetmap.org.
-14.1.0         IN      PTR     errol.oob.openstreetmap.org.
 15.1.0         IN      PTR     ysera.oob.openstreetmap.org.
 17.1.0         IN      PTR     clifford.oob.openstreetmap.org.
-19.1.0         IN      PTR     grindtooth.oob.openstreetmap.org.
 20.1.0         IN      PTR     pummelzacken.oob.openstreetmap.org.
-40.1.0         IN      PTR     tiamat-00.oob.openstreetmap.org.
-41.1.0         IN      PTR     tiamat-01.oob.openstreetmap.org.
-42.1.0         IN      PTR     tiamat-02.oob.openstreetmap.org.
-43.1.0         IN      PTR     tiamat-03.oob.openstreetmap.org.
-44.1.0         IN      PTR     tiamat-10.oob.openstreetmap.org.
-45.1.0         IN      PTR     tiamat-11.oob.openstreetmap.org.
-46.1.0         IN      PTR     tiamat-12.oob.openstreetmap.org.
-47.1.0         IN      PTR     tiamat-13.oob.openstreetmap.org.
-48.1.0         IN      PTR     tiamat-20.oob.openstreetmap.org.
-49.1.0         IN      PTR     tiamat-21.oob.openstreetmap.org.
-50.1.0         IN      PTR     tiamat-22.oob.openstreetmap.org.
-51.1.0         IN      PTR     tiamat-23.oob.openstreetmap.org.
-
-2.16.0         IN      PTR     orm.bm.openstreetmap.org.
-3.16.0         IN      PTR     shenron.bm.openstreetmap.org.
-
-20.32.0                IN      PTR     grisu.bm.openstreetmap.org.
-21.32.0                IN      PTR     spike-04.bm.openstreetmap.org.
-22.32.0                IN      PTR     spike-05.bm.openstreetmap.org.
-40.32.0                IN      PTR     katla.bm.openstreetmap.org.
-41.32.0                IN      PTR     thorn-04.bm.openstreetmap.org.
-42.32.0                IN      PTR     thorn-05.bm.openstreetmap.org.
-
-20.33.0                IN      PTR     grisu.oob.openstreetmap.org.
-21.33.0                IN      PTR     spike-04.oob.openstreetmap.org.
-22.33.0                IN      PTR     spike-05.oob.openstreetmap.org.
-40.33.0                IN      PTR     katla.oob.openstreetmap.org.
-41.33.0                IN      PTR     thorn-04.oob.openstreetmap.org.
-42.33.0                IN      PTR     thorn-05.oob.openstreetmap.org.
 
+3.48.0         IN      PTR     faffy.ams.openstreetmap.org.
+4.48.0         IN      PTR     dribble.ams.openstreetmap.org.
+5.48.0         IN      PTR     vhagar.ams.openstreetmap.org.
 9.48.0         IN      PTR     dulcy.ams.openstreetmap.org.
 10.48.0                IN      PTR     ironbelly.ams.openstreetmap.org.
 11.48.0                IN      PTR     spike-06.ams.openstreetmap.org.
@@ -92,14 +39,14 @@ $TTL        604800
 14.48.0                IN      PTR     tabaluga.ams.openstreetmap.org.
 15.48.0                IN      PTR     odin.ams.openstreetmap.org.
 16.48.0                IN      PTR     lockheed.ams.openstreetmap.org.
+17.48.0                IN      PTR     norbert.ams.openstreetmap.org.
 49.48.0                IN      PTR     snap-01.ams.openstreetmap.org.
 50.48.0                IN      PTR     karm.ams.openstreetmap.org.
-52.48.0                IN      PTR     thorn-02.ams.openstreetmap.org.
-53.48.0                IN      PTR     thorn-03.ams.openstreetmap.org.
 100.48.0       IN      PTR     pdu1.ams.openstreetmap.org.
 101.48.0       IN      PTR     pdu2.ams.openstreetmap.org.
 102.48.0       IN      PTR     oob1.ams.openstreetmap.org.
 
+3.49.0         IN      PTR     faffy.oob.openstreetmap.org.
 9.49.0         IN      PTR     dulcy.oob.openstreetmap.org.
 10.49.0                IN      PTR     ironbelly.oob.openstreetmap.org.
 11.49.0                IN      PTR     spike-06.oob.openstreetmap.org.
@@ -108,6 +55,7 @@ $TTL 604800
 14.49.0                IN      PTR     tabaluga.oob.openstreetmap.org.
 15.49.0                IN      PTR     odin.oob.openstreetmap.org.
 16.49.0                IN      PTR     lockheed.oob.openstreetmap.org.
+17.49.0                IN      PTR     norbert.oob.openstreetmap.org.
 49.49.0                IN      PTR     snap-01.oob.openstreetmap.org.
 50.49.0                IN      PTR     karm.oob.openstreetmap.org.
 52.49.0                IN      PTR     thorn-02.oob.openstreetmap.org.
@@ -121,6 +69,12 @@ $TTL        604800
 7.64.0         IN      PTR     konqi.dub.openstreetmap.org.
 8.64.0         IN      PTR     naga.dub.openstreetmap.org.
 9.64.0         IN      PTR     culebre.dub.openstreetmap.org.
+10.64.0                IN      PTR     horntail.dub.openstreetmap.org.
+13.64.0                IN      PTR     longma.dub.openstreetmap.org.
+14.64.0                IN      PTR     smaug.dub.openstreetmap.org.
+15.64.0                IN      PTR     muirdris.dub.openstreetmap.org.
+16.64.0                IN      PTR     fume.dub.openstreetmap.org.
+17.64.0                IN      PTR     grisu.dub.openstreetmap.org.
 50.64.0                IN      PTR     snap-03.dub.openstreetmap.org.
 100.64.0       IN      PTR     pdu1.dub.openstreetmap.org.
 101.64.0       IN      PTR     pdu2.dub.openstreetmap.org.
@@ -134,4 +88,8 @@ $TTL 604800
 7.65.0         IN      PTR     konqi.oob.openstreetmap.org.
 8.65.0         IN      PTR     naga.oob.openstreetmap.org.
 9.65.0         IN      PTR     culebre.oob.openstreetmap.org.
+10.65.0                IN      PTR     horntail.oob.openstreetmap.org.
+13.65.0                IN      PTR     longma.oob.openstreetmap.org.
+14.65.0                IN      PTR     smaug.oob.openstreetmap.org.
+15.65.0                IN      PTR     muirdris.oob.openstreetmap.org.
 50.65.0                IN      PTR     snap-03.oob.openstreetmap.org.