Make dev sites serve crossdomain.xml with correct MIME type

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 9cea98f0a2cdff5c59b84c87f81e55127abdd7c5..aa5d8ebf20832f641369c24a0bcc7d581a82606d 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -52,7 +52,7 @@ action :create do
     user "root"
     group "root"
     mode 0o644
-    variables :title => title
+    variables :title => new_resource.title
   end
 
   cookbook_file "/srv/#{new_resource.site}/imagery.css" do
@@ -95,15 +95,11 @@ action :create do
     domains tile_domains
   end
 
-  resolvers = node[:networking][:nameservers].map do |resolver|
-    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-  end
-
   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"
     restart_nginx false
-    variables new_resource.to_hash.merge(:resolvers => resolvers)
+    variables new_resource.to_hash
   end
 end