@@ -20,6 +20,15 @@ </div> <% end %> + + <p> + If you are unable to install Ruby on Rails (e.g. because you do not have + control over this server) then you could also <em>vendor</em> (bundle) + your Rails version into your application by running <pre>rake vendor:rails</pre> + in your application's source directory, and redeploying your application. + Please search the Internet for "vendor rails" if you're not familiar with + this technique. + </p> </div> <% end %> lib/phusion_passenger/templates/version_not_found.html.erb @@ -15,10 +15,11 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib" -require 'passenger/html_template' -require 'passenger/spawn_manager' -require 'passenger/platform_info' +$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") +$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext") +require 'phusion_passenger/html_template' +require 'phusion_passenger/spawn_manager' +require 'phusion_passenger/platform_info' include PhusionPassenger if !defined?(Mysql::Error) @@ -101,7 +102,7 @@ def start render_error_page(e, 'general_error.html', 'general_error') - e = StandardError.new("Some error message") + e = AppInitError.new("Some error message", create_dummy_exception) render_error_page(e, 'app_exited.html', 'app_exited_during_initialization') end misc/render_error_pages.rb 672e3ba7775ad978d13b67f7e57aa5c7470f3ebb 1c04be9be53aa0324ae9ee23a3dd184114ea8bd7 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/4e57c4f2ce47e11a860ca503c7602efaffb65d89 4e57c4f2ce47e11a860ca503c7602efaffb65d89 2009-03-17T02:13:26-07:00 2009-03-17T02:13:26-07:00 Merge branch 'stable-2.1' 69b83ffa46957aa47b78451de2663d7789760a54 Hongli Lai (Phusion) hongli@phusion.nl