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 83280244a8f1a66228835fe63ddf761d528f57ab..b9b2ca305787173a092101bf8f1714386af46792 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -19,29 +19,20 @@
 
 certificate = node[:apache][:ssl][:certificate]
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
 
 include_recipe "apache"
 include_recipe "ssl"
 
-apache_module "socache_shmcb" do
-  only_if { node[:lsb][:release].to_f >= 14.04 }
-end
-
 apache_module "ssl"
 
-template "/etc/apache2/conf.d/ssl" do
-  source "ssl.erb"
-  owner "root"
-  group "root"
-  mode 0644
+apache_conf "ssl" do
+  template "ssl.erb"
   variables :certificate => certificate
   notifies :reload, "service[apache2]"
 end
 
-service "apache2" do
-  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
+apache = resources("service[apache2]")
+
+apache.subscribes(:restart, "file[/etc/ssl/certs/#{certificate}.pem]")
+apache.subscribes(:restart, "file[/etc/ssl/private/#{certificate}.key]")