X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d7897a0aa9147b2cea021cf478461ae9df12277c..61c3ffa669f32728c805a57b13406c0aaf1b5431:/cookbooks/apache/recipes/ssl.rb?ds=inline diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb index b32c11c8b..700e10e4a 100644 --- a/cookbooks/apache/recipes/ssl.rb +++ b/cookbooks/apache/recipes/ssl.rb @@ -24,20 +24,21 @@ 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, resources(:service => "apache2") + 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/rapidssl.pem]" + subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]" + subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]" end