Add basic tests for shorewall

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

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index d8d1434d06cdc24fd95dcc72ade820a3cfce9162..e96af7e35baafec9396ad890f489a9ce551d4ee5 100644 (file)
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -20,7 +20,7 @@
 package "memcached"
 
 service "memcached" do
 package "memcached"
 
 service "memcached" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 


@@ -28,34 +28,16 @@ template "/etc/memcached.conf" do
   source "memcached.conf.erb"
   owner "root"
   group "root"
   source "memcached.conf.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, resources(:service => "memcached")
+  mode 0o644
+  notifies :restart, "service[memcached]"

 end
 
 munin_plugin_conf "memcached_multi" do
   template "munin.erb"
 end
 
 end
 
 munin_plugin_conf "memcached_multi" do
   template "munin.erb"
 end
 

-munin_plugin "memcached_multi_bytes" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_commands" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_conns" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_evictions" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_items" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_memory" do
-  target "memcached_multi_"
+%w(bytes commands conns evictions items memory).each do |stat|
+  munin_plugin "memcached_multi_#{stat}" do
+    target "memcached_multi_"
+  end

 end
 end