From: Tom Hughes <tom@compton.nu>
Date: Sun, 11 Aug 2013 13:27:22 +0000 (+0100)
Subject: Update dns.osm.org for changes in mkgeo
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/42e89176c4be080a12f0ea38c4032e3c7436a173

Update dns.osm.org for changes in mkgeo
---

diff --git a/cookbooks/dns/files/default/html/dns.js b/cookbooks/dns/files/default/html/dns.js
index 0677292a3..caf3cedb8 100644
--- a/cookbooks/dns/files/default/html/dns.js
+++ b/cookbooks/dns/files/default/html/dns.js
@@ -17,7 +17,7 @@ function createMap(divName, jsonFile) {
           return { color: feature.properties.colour, weight: 2, opacity: 1 }
         },
         onEachFeature: function (feature, layer) {
-          layer.bindPopup(feature.properties.country + " via " + feature.properties.server);
+          layer.bindPopup(feature.properties.origin + " via " + feature.properties.server);
           layer.on("mouseover", function () {
             this.setStyle({ weight: 5 });
           });
diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 5486014d9..530fd77e4 100644
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -49,8 +49,8 @@ end
 
 zones = Array.new
 
-Dir.glob("/var/lib/dns/kml/*.kml").each do |kmlfile|
-  zone = File.basename(kmlfile, ".kml")
+Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
+  zone = File.basename(kmlfile, ".json")
 
   template "/srv/dns.openstreetmap.org/html/#{zone}.html" do
     source "zone.html.erb"