Update chef client to 11.18.0-1

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

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index 356416795afa86f525e4800d4f8aa2429fb34388..700e10e4af5afcf379514d5ec020cb632bd61944 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -24,13 +24,14 @@ 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