Convert all notify/subscribe calls to the new style syntax

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

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index a31ac0c061ff259df688d4cf4381d7cf94952c8a..356416795afa86f525e4800d4f8aa2429fb34388 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -17,7 +17,9 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificate] = node[:ssl][:certificate] | [ "openstreetmap" ]
+certificate = node[:apache][:ssl][:certificate]
+
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
 
 include_recipe "apache"
 include_recipe "ssl"
@@ -29,12 +31,13 @@ template "/etc/apache2/conf.d/ssl" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "apache2")
+  variables :certificate => certificate
+  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/openstreetmap.pem")
-  subscribes :restart, resources(:file => "/etc/ssl/private/openstreetmap.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