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 0677292a36c34ff466c0bc15a6cf414fec40c624..caf3cedb820d3dccd309f90682b08faa13f2c5b1 100644 (file)
--- 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) {
           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 });
           });
           layer.on("mouseover", function () {
             this.setStyle({ weight: 5 });
           });

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 5486014d9e889d6c44340dde95e333c550c208ef..530fd77e40c09899c19e8d2398ee7234fc3eaee6 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -49,8 +49,8 @@ end
 
 zones = Array.new
 
 
 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"
 
   template "/srv/dns.openstreetmap.org/html/#{zone}.html" do
     source "zone.html.erb"