diff --git a/config.ru b/config.ru index d01927cad..836bfedd3 100644 --- a/config.ru +++ b/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 diff --git a/config/initializers/sub_uri.rb b/config/initializers/sub_uri.rb deleted file mode 100644 index 969147af2..000000000 --- a/config/initializers/sub_uri.rb +++ /dev/null @@ -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 -