Merge remote-tracking branch 'github/pull/713'

[chef.git] / cookbooks / passenger / templates / default / ruby.erb

diff --git a/cookbooks/passenger/templates/default/ruby.erb b/cookbooks/passenger/templates/default/ruby.erb
index fb7575ab0ad9e424609b8c034e7131cf6f5fc24e..f45fd210eaa6d2f11844bb75baab50b5ecd8df00 100644 (file)
--- a/cookbooks/passenger/templates/default/ruby.erb
+++ b/cookbooks/passenger/templates/default/ruby.erb
@@ -1,12 +1,7 @@
 #!/bin/sh
 
-<% if node[:passenger][:ruby_version].to_f < 2.1 -%>
-export RUBY_HEAP_MIN_SLOTS=500000
-export RUBY_HEAP_FREE_MIN=100000
-<% else -%>
 export RUBY_GC_HEAP_INIT_SLOTS=500000
 export RUBY_GC_HEAP_FREE_SLOTS=100000
-<% end -%>
 export RUBY_GC_MALLOC_LIMIT=50000000
 
-exec /usr/bin/ruby<%= node[:passenger][:ruby_version] %> "$@"
+exec /usr/bin/ruby<%= node[:ruby][:version] %> "$@"