From: Tom Hughes <tom@compton.nu>
Date: Tue, 6 Sep 2016 20:17:05 +0000 (+0100)
Subject: Avoid redeclaring apache service resource
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2b6d9255f4f92ddb5365c011c2ccb44773f15165?ds=sidebyside

Avoid redeclaring apache service resource
---

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index 0dbe07c2f..f87971157 100644
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -33,9 +33,8 @@ apache_conf "ssl" do
   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
+apache = resources("service[apache2]")
+
+apache.subscribes(:restart, "cookbook_file[/etc/ssl/certs/#{certificate_chain}.pem]")
+apache.subscribes(:restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]")
+apache.subscribes(:restart, "file[/etc/ssl/private/#{certificate}.key]")