Add fallback backend to nginx + enable keepalive

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index ce4819ad098a21621f162de63ef6a76707adb55c..e6028ebb5ffc7bf6e561cb61d908520f970c7c8c 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -31,6 +31,7 @@ package "apache2" do
 end
 
 package "xz-utils"
+package "openssl"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
@@ -84,12 +85,12 @@ nginx_site "default" do
 end
 
 resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : "#{resolver}"
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
 end
 
 nginx_site "tile-ssl" do
   template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate, :resolvers => resolvers
+  variables :certificate => certificate, :resolvers => resolvers, :renders => tilerenders
 end
 
 service "nginx-certificate-restart" do