Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disabled ssl for enterprise #128

Merged
merged 2 commits into from
Dec 19, 2019
Merged

disabled ssl for enterprise #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
955f46b
disabled ssl for enterprise
tahsin352 Dec 18, 2019
9422a8d
pass through conig
tahsin352 Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config.ru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ require 'rack/ssl-enforcer'
require 'travis/yml/web'

env = Travis::Yml::Web::Env
config ||= Travis::Yml::Web::Config.load
Tahsin-travis-ci marked this conversation as resolved.
Show resolved Hide resolved

if env.production?
use Rack::SslEnforcer
use Rack::SslEnforcer unless config.is_enterprise?
use Travis::Yml::Web::BasicAuth

elsif env.staging?
Expand Down
3 changes: 2 additions & 1 deletion lib/travis/yml/web/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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