Commit d441eec5934ba741b5e15cca9c07cb00dd9c9b78 to FooBarWidget's passenger

FooBarWidget / passenger

Description:	Phusion Passenger (mod_rails)
Homepage:	http://www.modrails.com/
Clone URL:	git://github.com/FooBarWidget/passenger.git Give this clone URL to anyone. `git clone git://github.com/FooBarWidget/passenger.git`
Search Repo:

Click here to lend your support to: passenger and make a donation at www.pledgie.com !

Fix integration tests.

Hongli Lai (Phusion) (author)

Sat Apr 19 04:01:41 -0700 2008

commit d441eec5934ba741b5e15cca9c07cb00dd9c9b78
tree eacf120bc79e57315ae9a3c6f25afcc095922528
parent d176cb539d42c307a946285bd830380d2d9930f0

test/stub/apache2/httpd.conf.erb
test/support/apache2_config_writer.rb

test/stub/apache2/httpd.conf.erb

0
@@ -26,7 +26,7 @@ Listen 127.0.0.1:64506
0
 <% end %>
0
 LoadModule passenger_module "<%= @mod_passenger %>"
0
 
0
-RailsSpawnServer "<%= @spawn_server %>"
0
+PassengerRoot "<%= @passenger_root %>"
0
 RailsRuby "<%= RUBY %>"
0
 RailsEnv production
0

test/support/apache2_config_writer.rb

0
@@ -8,7 +8,7 @@ class Apache2ConfigWriter
0
   def initialize
0
     @stub_dir = File.expand_path(File.dirname(__FILE__) + "/../stub")
0
     @server_root = "#{@stub_dir}/apache2"
0
-		@spawn_server = File.expand_path(File.dirname(__FILE__) + "/../../bin/passenger-spawn-server")
0
+		@passenger_root = File.expand_path(File.dirname(__FILE__) + "/../..")
0
     @modules_dir = `#{APXS2} -q LIBEXECDIR`.strip
0
     @modules = `#{HTTPD} -l`.split("\n").grep(/\.c$/).map do |line|
0
       line.strip

Comments

No one has commented yet.