Make map export check CPU idle time not load average

[chef.git] / cookbooks / dns / recipes / default.rb

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index d34858d9ecde567451d16259606fdb68d62f28ba..3ea745d3c71aacfb66c9b5111d40ce9f748fc64d 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -30,7 +30,6 @@ package "libxml-writer-perl"
 package "libyaml-perl"
 package "libwww-perl"
 package "libjson-xs-perl"
 package "libyaml-perl"
 package "libwww-perl"
 package "libjson-xs-perl"

-package "liblwp-useragent-determined-perl"

 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"


@@ -48,7 +47,7 @@ remote_directory "/srv/dns.openstreetmap.org/html" do
   files_mode 0644
 end
 
   files_mode 0644
 end
 

-zones = Array.new
+zones = []

 
 Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
   zone = File.basename(kmlfile, ".json")
 
 Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
   zone = File.basename(kmlfile, ".json")


@@ -72,7 +71,7 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   variables :zones => zones
 end
 
   variables :zones => zones
 end
 

-apache_site "dns.openstreetmap.org" do 
+apache_site "dns.openstreetmap.org" do

   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
 end
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
 end


@@ -96,7 +95,7 @@ directory "/var/lib/dns" do
   owner "git"
   group "git"
   mode 02775
   owner "git"
   group "git"
   mode 02775

-  notifies :run, resources(:execute => "dns-update")
+  notifies :run, "execute[dns-update]"

 end
 
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
 end
 
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do