generators/vulcanize/templates/munin/config/rubber/common/munin-plugins.conf in axtro-rubber-1.2.3 vs generators/vulcanize/templates/munin/config/rubber/common/munin-plugins.conf in axtro-rubber-1.5.7
- old
+ new
@@ -1,9 +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 (REE vs regular)
+# to make sure we are running the correct ruby (rvm env vars, plus paths)
[*]
-env.PATH /sbin:/usr/sbin:/usr/local/sbin:<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:/usr/bin:/bin
+<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
+env.<%= k %> <%= v %>
+<%- end -%>
env.RUBYOPT rubygems