X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/09f04cdbddd45cb7074086a650cd3415c5b0fa70..a884ecbc667c29750d26ca2ad8f325f857ead5d3:/cookbooks/apache/recipes/ssl.rb?ds=inline

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index 83280244a..0dbe07c2f 100644
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -18,30 +18,24 @@
 #
 
 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
+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, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
+  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