X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/c862fb7a65c202840f92e551bfc1415a20f4492a..a839868a4ce8d05946a97f83c1aa451028c07889:/cookbooks/tilecache/recipes/default.rb diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 1aad4b9ff..e6028ebb5 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -20,7 +20,7 @@ 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" @@ -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] } @@ -80,16 +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}" + 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