Drop all use of SSLCertificateChainFile in apache configs

[chef.git] / cookbooks / apache / recipes / ssl.rb

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index f87971157c0e6e25f3bff3a4c845045d1d191b21..b9b2ca305787173a092101bf8f1714386af46792 100644 (file)
--- 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, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]")
+apache.subscribes(:restart, "file[/etc/ssl/certs/#{certificate}.pem]")
 apache.subscribes(:restart, "file[/etc/ssl/private/#{certificate}.key]")