diff --git a/config.ru b/config.ru index f698486de..5aabb03ea 100644 --- a/config.ru +++ b/config.ru @@ -4,9 +4,10 @@ require 'rack/ssl-enforcer' require 'travis/yml/web' env = Travis::Yml::Web::Env +config ||= Travis::Yml::Web::Config.load if env.production? - use Rack::SslEnforcer + use Rack::SslEnforcer unless config.is_enterprise? use Travis::Yml::Web::BasicAuth elsif env.staging? diff --git a/lib/travis/yml/web/config.rb b/lib/travis/yml/web/config.rb index 0f6729bdc..215a56943 100644 --- a/lib/travis/yml/web/config.rb +++ b/lib/travis/yml/web/config.rb @@ -3,6 +3,7 @@ module Travis::Yml::Web class Config < Travis::Config - define auth_keys: ['abc123'] + define auth_keys: ['abc123'], + is_enterprise: ENV['TRAVIS_ENTERPRISE'] || false end end