templates/munin/config/rubber/role/munin/munin-plugins.conf in rubber-2.1.2 vs templates/munin/config/rubber/role/munin/munin-plugins.conf in rubber-2.2.0
- old
+ new
@@ -1,11 +1,11 @@
<%
@path = '/etc/munin/plugin-conf.d/rubber'
%>
-# munin-node clears out enviroment variables, so we need to add these in
-# to make sure we are running the correct ruby (rvm env vars, plus paths)
+# munin-node clears out environment variables, so we need to add these in
+# to make sure we are running the correct ruby (ruby env vars, plus paths)
[*]
-<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i; v != "" }.each do |k, v| -%>
+<%- ENV.select {|k, v| k =~ /ruby|bundler|gem|path/i; v != "" }.each do |k, v| -%>
env.<%= k %> <%= v %>
<%- end -%>
env.RUBYOPT rubygems