Skip to content

Commit

Permalink
Revert "Mount application on proper location" - changes cause app to …
Browse files Browse the repository at this point in the history 
…fail when there's no trailing / on the pod_url.

This reverts commit 18827b4.
  • Loading branch information
@sarahmei
sarahmei committed Jan 10, 2011
1 parent b865c20 commit 38102eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
10 changes: 3 additions & 7 deletions config.ru
View file
Expand Up @@ -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
8 changes: 0 additions & 8 deletions config/initializers/sub_uri.rb
View file

This file was deleted.

2 comments on commit 38102eb

@maxwell
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the app actually work when you do NOT have a trailing slash? it may boot, but i think some of your webfinger stuff would not work. this is all mostly from memory, so I could be wrong.

@sarahmei
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, it works fine for development, but if webfinger won't work with a pod url with no trailing slash, then we should prevent people from setting it up that way.

Please sign in to comment.