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

[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 4091ded1b0a92a963e588f299bddb05bd98eb520..55c99e6f68d9c62649eba9ed8e797cc051405290 100644 (file)
--- a/cookbooks/bind/templates/default/db.10.erb
+++ b/cookbooks/bind/templates/default/db.10.erb
@@ -2,7 +2,7 @@
 
 $TTL   604800
 @      IN      SOA     <%= node[:fdqn] %>. root.openstreetmap.org. (
 
 $TTL   604800
 @      IN      SOA     <%= node[:fdqn] %>. root.openstreetmap.org. (

-                     2019040301                ; Serial
+                     2021092001                ; Serial

                          604800                ; Refresh
                           86400                ; Retry
                         2419200                ; Expire
                          604800                ; Refresh
                           86400                ; Retry
                         2419200                ; Expire


@@ -84,12 +84,6 @@ $TTL 604800
 41.33.0                IN      PTR     thorn-04.oob.openstreetmap.org.
 42.33.0                IN      PTR     thorn-05.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     orm.ams.openstreetmap.org.
-4.48.0         IN      PTR     ouroboros.ams.openstreetmap.org.
-5.48.0         IN      PTR     ramoth.ams.openstreetmap.org.
-6.48.0         IN      PTR     spike-01.ams.openstreetmap.org.
-7.48.0         IN      PTR     spike-02.ams.openstreetmap.org.
-8.48.0         IN      PTR     spike-03.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.
 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.


@@ -102,15 +96,10 @@ $TTL       604800
 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.
 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.openstreetmap.org.
-101.48.0       IN      PTR     pdu2.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     orm.oob.openstreetmap.org.
-4.49.0         IN      PTR     ouroboros.oob.openstreetmap.org.
-5.49.0         IN      PTR     ramoth.oob.openstreetmap.org.
-6.49.0         IN      PTR     spike-01.oob.openstreetmap.org.
-7.49.0         IN      PTR     spike-02.oob.openstreetmap.org.
-8.49.0         IN      PTR     spike-03.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.
 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.


@@ -123,3 +112,26 @@ $TTL       604800
 50.49.0                IN      PTR     karm.oob.openstreetmap.org.
 52.49.0                IN      PTR     thorn-02.oob.openstreetmap.org.
 53.49.0                IN      PTR     thorn-03.oob.openstreetmap.org.
 50.49.0                IN      PTR     karm.oob.openstreetmap.org.
 52.49.0                IN      PTR     thorn-02.oob.openstreetmap.org.
 53.49.0                IN      PTR     thorn-03.oob.openstreetmap.org.

+
+2.64.0         IN      PTR     fafnir.dub.openstreetmap.org.
+3.64.0         IN      PTR     spike-01.dub.openstreetmap.org.
+4.64.0         IN      PTR     spike-02.dub.openstreetmap.org.
+5.64.0         IN      PTR     spike-03.dub.openstreetmap.org.
+6.64.0         IN      PTR     idris.dub.openstreetmap.org.
+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.
+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.
+102.64.0       IN      PTR     oob1.dub.openstreetmap.org.
+
+2.65.0         IN      PTR     fafnir.oob.openstreetmap.org.
+3.65.0         IN      PTR     spike-01.oob.openstreetmap.org.
+4.65.0         IN      PTR     spike-02.oob.openstreetmap.org.
+5.65.0         IN      PTR     spike-03.oob.openstreetmap.org.
+6.65.0         IN      PTR     idris.oob.openstreetmap.org.
+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.
+50.65.0                IN      PTR     snap-03.oob.openstreetmap.org.