X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/09e86f797624a3b8356089d6e79c2debaa6b8055..aa02df0d2f61fb4d1839e1e9fca1ec95c249572a:/cookbooks/tilecache/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 4711428a2..1f02661b7 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,14 +17,21 @@
 # limitations under the License.
 #
 
+require "ipaddr"
+
 certificate = node[:tilecache][:ssl][:certificate]
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 
+package "apache2" do
+  action :remove
+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] }
@@ -74,12 +81,16 @@ template "/etc/logrotate.d/squid" do
 end
 
 nginx_site "default" do
-  action [ :delete ]
+  action [:delete]
+end
+
+resolvers = node[:networking][:nameservers].map do |resolver|
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
 end
 
 nginx_site "tile-ssl" do
   template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate
+  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
 end
 
 service "nginx-certificate-restart" do