Avoid redeclaring apache service resource
authorTom Hughes <tom@compton.nu>
Tue, 6 Sep 2016 20:17:05 +0000 (21:17 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 6 Sep 2016 20:17:05 +0000 (21:17 +0100)
cookbooks/apache/recipes/ssl.rb

index 0dbe07c2ff7f5cd476cc8739652e57d5941f1242..f87971157c0e6e25f3bff3a4c845045d1d191b21 100644 (file)
@@ -33,9 +33,8 @@ apache_conf "ssl" do
   notifies :reload, "service[apache2]"
 end
 
   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]")