Split out default munin plugin installation to a new recipe

[chef.git] / cookbooks / nginx / recipes / default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 480937407b3c5421e93e6ca4e4ec5eb7a5044649..aec734c17f2ae9dc9744b1dcdd78724bfeb58b4a 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
+
 package "nginx"
 
 resolvers = node[:networking][:nameservers].map do |resolver|
@@ -50,7 +52,7 @@ end
 service "nginx" do
   action [:enable] # Do not start the service as config may be broken from failed chef run
   supports :status => true, :restart => true, :reload => true
-  subscribes :restart, "template[/etc/nginx/nginx.conf]", :immediately
+  subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
 
 munin_plugin_conf "nginx" do