Move readonly load to katla

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 5486014d9e889d6c44340dde95e333c550c208ef..3ea745d3c71aacfb66c9b5111d40ce9f748fc64d 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -47,10 +47,10 @@ 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/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"


@@ -71,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


@@ -95,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