X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/37c0446fb32977edfa5647799a62bde3256a6d32..b0e794ecd4ca2669d1f34c563ed2cfcc8b37a06c:/cookbooks/apache/recipes/ssl.rb?ds=sidebyside diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb index 3e3941099..b9b2ca305 100644 --- a/cookbooks/apache/recipes/ssl.rb +++ b/cookbooks/apache/recipes/ssl.rb @@ -18,7 +18,6 @@ # certificate = node[:apache][:ssl][:certificate] -certificate_chain = node[:apache][:ssl][:certificate_chain] node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate] @@ -29,12 +28,11 @@ apache_module "ssl" apache_conf "ssl" do template "ssl.erb" - variables :certificate => certificate, :certificate_chain => certificate_chain + variables :certificate => certificate notifies :reload, "service[apache2]" end apache = resources("service[apache2]") -apache.subscribes(:restart, "cookbook_file[/etc/ssl/certs/#{certificate_chain}.pem]") apache.subscribes(:restart, "file[/etc/ssl/certs/#{certificate}.pem]") apache.subscribes(:restart, "file[/etc/ssl/private/#{certificate}.key]")