nominatim: UI forwarding should take precedence to blocking

[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 1299bb729fc7e5ce30eb1c859468ced80ead204e..719f11a9d8e56cb33609ea2229fecf7642248a1f 100644 (file)
--- a/cookbooks/geodns/templates/default/geo.erb
+++ b/cookbooks/geodns/templates/default/geo.erb
@@ -1,19 +1,15 @@
 $TTL 86400
 
-@              SOA     saphira.openstreetmap.org. hostmaster.openstreetmap.org. (
-               2       ; serial
+@              SOA     <%= @servers.first %>. hostmaster.openstreetmap.org. (
+               3       ; serial
                86400   ; refresh
                7200    ; retry
                604800  ; expire
                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           600     DYNC    geoip!tile
-nominatim      600     DYNC    geoip!nominatim
+nominatim      300     DYNC    geoip!nominatim