be smarter about host setting

This commit is contained in:
Konstantin Haase 2013-09-03 23:35:38 +02:00 committed by Sven Fuchs
parent b8d700ea65
commit 2b6f2ceabe

View File

@ -3,13 +3,12 @@ require 'travis/api/app'
class Travis::Api::App
class Endpoint
class Home < Endpoint
unless Travis.config.client_domain or test?
fail "Travis.config.client_domain is not set"
end
host = Travis.config.client_domain || Travis.config.host
fail "Travis.config.client_domain is not set" unless host or test?
set :prefix, '/'
set :client_config,
host: Travis.config.client_domain,
host: host,
shorten_host: Travis.config.shorten_host,
assets: Travis.config.assets,
pusher: (Travis.config.pusher || {}).to_hash.slice(:host, :port, :scheme, :key),