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 8c576aeff6429f8f93d0c8070289d9e7e37504d3..719f11a9d8e56cb33609ea2229fecf7642248a1f 100644 (file)
--- a/cookbooks/geodns/templates/default/geo.erb
+++ b/cookbooks/geodns/templates/default/geo.erb
@@ -1,15 +1,15 @@
 $TTL 86400
 
-@      SOA     a.ns.openstreetmap.org. hostmaster.openstreetmap.org. (
-       1       ; serial
-       86400   ; refresh
-       172800  ; retry
-       604800  ; expire
-       3600    ; ncache
+@              SOA     <%= @servers.first %>. hostmaster.openstreetmap.org. (
+               3       ; serial
+               86400   ; refresh
+               7200    ; retry
+               604800  ; expire
+               3600    ; ncache
 )
 
-@      86400   NS      a.ns.openstreetmap.org.
-@      86400   NS      b.ns.openstreetmap.org.
-@      86400   NS      c.ns.openstreetmap.org.
+<% @servers.each do |server| -%>
+@              86400   NS      <%= server %>.
+<% end -%>
 
-tile   3600    DYNC    geoip!tile
+nominatim      300     DYNC    geoip!nominatim