Remove legacy certificate support

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

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index 0dbe07c2ff7f5cd476cc8739652e57d5941f1242..b2818df708127d6ae4f44b313cd0b28c57e3b8db 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -17,11 +17,6 @@
 # limitations under the License.
 #
 
-certificate = node[:apache][:ssl][:certificate]
-certificate_chain = node[:apache][:ssl][:certificate_chain]
-
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
-
 include_recipe "apache"
 include_recipe "ssl"
 
@@ -29,13 +24,5 @@ apache_module "ssl"
 
 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/#{certificate_chain}.pem]"
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]"
-  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
-end