nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Mount application on proper location" - changes cause app to fail when there's no trailing / on the pod_url.

Browse source 
This reverts commit 18827b40d1.
This commit is contained in:
Sarah Mei 2011-01-09 18:32:01 -08:00
parent b865c20b2d
commit 38102ebda7
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config.ru
View file

@ -6,15 +6,11 @@
require ::File.expand_path('../config/environment', __FILE__) require ::File.expand_path('../config/environment', __FILE__)
require ::File.expand_path('../lib/chrome_frame', __FILE__) require ::File.expand_path('../lib/chrome_frame', __FILE__)
require 'lib/host-meta' require ::File.expand_path('../lib/host-meta', __FILE__)
#use Rack::FiberPool
map "/.well-known" do map "/.well-known" do
run HostMeta::File.new( "public/well-known") run HostMeta::File.new( "public/well-known")
end end
map AppConfig[:pod_uri].path do use Rack::ChromeFrame, :minimum => 8
use Rack::ChromeFrame, :minimum => 8 run Diaspora::Application
use Rack::ShowExceptions
run Diaspora::Application
end

8
config/initializers/sub_uri.rb
View file

@ -1,8 +0,0 @@
p = AppConfig[ :pod_uri].path
if p and not p.empty? and p != "/"
Rails.application.routes.default_url_options = { :script_name => p }
else
p = nil
end