Remove a couple of requests for legacy certificates

[chef.git] / cookbooks / apache / recipes / ssl.rb

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index b791742962fe2dadb6b434c6293f630001e55633..b2818df708127d6ae4f44b313cd0b28c57e3b8db 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -17,28 +17,12 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-certificate = node[:apache][:ssl][:certificate]
-
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
-

 include_recipe "apache"
 include_recipe "ssl"
 
 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"
 apache_module "ssl"
 
 apache_conf "ssl" do
   template "ssl.erb"

-  variables :certificate => certificate

   notifies :reload, "service[apache2]"
 end
   notifies :reload, "service[apache2]"
 end

-
-service "apache2" do
-  action :nothing
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/startcom.pem]"
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]"
-  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
-end