Remove forced downgrade of hp-health

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index f8ab667319d6fcad61208bb4544b9c5a67c2b25a..d6e2071ccfb1a07518a1ede888eaba2b78404663 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -89,16 +89,21 @@ action :create do
   end
 
   base_domains = [name] + Array(aliases)
   end
 
   base_domains = [name] + Array(aliases)

+  tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }

 
   ssl_certificate new_resource.name do
 
   ssl_certificate new_resource.name do

-    domains base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] }
+    domains tile_domains
+  end
+
+  resolvers = node[:networking][:nameservers].map do |resolver|
+    IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver

   end
 
   nginx_site new_resource.name do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{name}"
     restart_nginx false
   end
 
   nginx_site new_resource.name do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{name}"
     restart_nginx false

-    variables new_resource.to_hash
+    variables new_resource.to_hash.merge(:resolvers => resolvers)

   end
 end
 
   end
 end