X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..e5f294d3dc676675b2803915571c28337468c3b3:/cookbooks/memcached/recipes/default.rb

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index d8d1434d0..93cbde312 100644
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -20,7 +20,7 @@
 package "memcached"
 
 service "memcached" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true
 end
 
@@ -28,34 +28,16 @@ template "/etc/memcached.conf" do
   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"
+  template_source "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