X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/184a48717ac0a4332b426980a0d48771ec7fed64..bd08729fe0c15a4769332a352cc3723dee13aa24:/cookbooks/tilecache/recipes/default.rb diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 13f752cd1..4711428a2 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -17,7 +17,8 @@ # limitations under the License. # -node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ] +certificate = node[:tilecache][:ssl][:certificate] +node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ] include_recipe "ssl" include_recipe "squid" @@ -78,6 +79,15 @@ end nginx_site "tile-ssl" do template "nginx_tile_ssl.conf.erb" + variables :certificate => certificate +end + +service "nginx-certificate-restart" do + service_name "nginx" + action :nothing + subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]" + subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]" + subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]" end tilerenders.each do |render|