X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..0d881c7262ed69a06591d7b29f4f9e370e100a8d:/cookbooks/apache/recipes/ssl.rb diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb index c85770402..d0b1b74d5 100644 --- a/cookbooks/apache/recipes/ssl.rb +++ b/cookbooks/apache/recipes/ssl.rb @@ -18,6 +18,7 @@ # certificate = node[:apache][:ssl][:certificate] +certificate_chain = node[:apache][:ssl][:certificate_chain] node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate] @@ -32,13 +33,13 @@ apache_module "ssl" apache_conf "ssl" do template "ssl.erb" - variables :certificate => certificate + 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