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

[chef.git] / cookbooks / geodns / templates / default / geo.erb

diff --git a/cookbooks/geodns/templates/default/geo.erb b/cookbooks/geodns/templates/default/geo.erb
index 9e306421879f7f5e09868043ca18d98f021d1796..719f11a9d8e56cb33609ea2229fecf7642248a1f 100644 (file)
--- a/cookbooks/geodns/templates/default/geo.erb
+++ b/cookbooks/geodns/templates/default/geo.erb
@@ -1,6 +1,6 @@
 $TTL 86400
 
 $TTL 86400
 

-@              SOA     saphira.openstreetmap.org. hostmaster.openstreetmap.org. (
+@              SOA     <%= @servers.first %>. hostmaster.openstreetmap.org. (

                3       ; serial
                86400   ; refresh
                7200    ; retry
                3       ; serial
                86400   ; refresh
                7200    ; retry


@@ -8,12 +8,8 @@ $TTL 86400
                3600    ; ncache
 )
 
                3600    ; ncache
 )
 

-@              86400   NS      balerion.openstreetmap.org.
-@              86400   NS      chrysophylax.openstreetmap.org.
-@              86400   NS      katie.openstreetmap.org.
-@              86400   NS      saphira.openstreetmap.org.
-@              86400   NS      stormfly-04.openstreetmap.org.
-@              86400   NS      ridgeback.openstreetmap.org.
+<% @servers.each do |server| -%>
+@              86400   NS      <%= server %>.
+<% end -%>

 
 

-tile           300     DYNC    geoip!tile

 nominatim      300     DYNC    geoip!nominatim
 nominatim      300     DYNC    geoip!nominatim