Move db-slave and nominatim-slave roles to public repository

[chef.git] / cookbooks / munin / libraries / expand.rb

diff --git a/cookbooks/munin/libraries/expand.rb b/cookbooks/munin/libraries/expand.rb
index 081dfc5c12299a2bd8ee7544b97e765059363794..4dadd14d38dfbc9f53c92ef4d933bd2a23eebeb5 100644 (file)
--- a/cookbooks/munin/libraries/expand.rb
+++ b/cookbooks/munin/libraries/expand.rb
@@ -2,10 +2,10 @@ class Chef
   class Munin
     def self.expand(template, nodes)
       nodes.map do |node|
-        if node.kind_of?(Hash)
-          template.gsub(/%%([^%]+)%%/) { node[$1.to_sym] }
+        if node.is_a?(Hash)
+          template.gsub(/%%([^%]+)%%/) { node[Regexp.last_match[1].to_sym] }
         else
-          template.gsub("%%", node)
+          template.gsub("%%%", node.tr("-", "_")).gsub("%%", node)
         end
       end.join(" ")
     end