X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d7897a0aa9147b2cea021cf478461ae9df12277c..1cb6635911ae9d6feab1c8efc7d4c33380169cd5:/cookbooks/apache/recipes/ssl.rb

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index b32c11c8b..d0b1b74d5 100644
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -18,26 +18,28 @@
 #
 
 certificate = node[:apache][:ssl][:certificate]
+certificate_chain = node[:apache][:ssl][:certificate_chain]
 
-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
-  variables :certificate => certificate
-  notifies :reload, resources(:service => "apache2")
+apache_conf "ssl" do
+  template "ssl.erb"
+  variables :certificate => certificate, :certificate_chain => certificate_chain
+  notifies :reload, "service[apache2]"
 end
 
 service "apache2" do
   action :nothing
-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/rapidssl.pem")
-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/#{certificate}.pem")
-  subscribes :restart, resources(:file => "/etc/ssl/private/#{certificate}.key")
+  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate_chain}.pem]"
+  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]"
+  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
 end