Revert "Mount application on proper location" - changes cause app to fail when there's no trailing / on the pod_url.
This reverts commit 18827b40d1.
This commit is contained in:
parent
b865c20b2d
commit
38102ebda7
2 changed files with 3 additions and 15 deletions
10
config.ru
10
config.ru
|
|
@ -6,15 +6,11 @@
|
|||
|
||||
require ::File.expand_path('../config/environment', __FILE__)
|
||||
require ::File.expand_path('../lib/chrome_frame', __FILE__)
|
||||
require 'lib/host-meta'
|
||||
#use Rack::FiberPool
|
||||
require ::File.expand_path('../lib/host-meta', __FILE__)
|
||||
|
||||
map "/.well-known" do
|
||||
run HostMeta::File.new( "public/well-known")
|
||||
end
|
||||
|
||||
map AppConfig[:pod_uri].path do
|
||||
use Rack::ChromeFrame, :minimum => 8
|
||||
use Rack::ShowExceptions
|
||||
run Diaspora::Application
|
||||
end
|
||||
use Rack::ChromeFrame, :minimum => 8
|
||||
run Diaspora::Application
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
Loading…
Reference in a new issue