X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..baac726bf3bd010dbbd26557b66c12dea53f7e97:/cookbooks/apache/recipes/ssl.rb diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb index c85770402..b2818df70 100644 --- a/cookbooks/apache/recipes/ssl.rb +++ b/cookbooks/apache/recipes/ssl.rb @@ -17,28 +17,12 @@ # limitations under the License. # -certificate = node[:apache][:ssl][: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" 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