X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/effb14435dcfd32dbfe1d2693117dfa97e9db84d..ff044920428608b2c04507ad52d6ab52c9d6555f:/cookbooks/dns/recipes/default.rb diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb index 5486014d9..95e3957fa 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" @@ -71,7 +71,7 @@ template "/srv/dns.openstreetmap.org/html/index.html" do 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 @@ -95,7 +95,7 @@ directory "/var/lib/dns" do 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