From 0fc0d0eb032ef9bc3729fd7b8461ec30a12d9685 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 29 Dec 2014 15:47:01 +0100
Subject: [PATCH] [pro-merge] Properly set defaults for travis-pro
---
config.ru | 19 ++++++++++++++++++-
public/index.html | 1 +
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/config.ru b/config.ru
index 13bfc917..b33503eb 100644
--- a/config.ru
+++ b/config.ru
@@ -33,6 +33,21 @@ use Travis::Web::ApiRedirect do |app|
app.settings.api_endpoint = ENV['API_ENDPOINT'] if ENV['API_ENDPOINT']
end
+if ENV['TRAVIS_PRO']
+ ENV['API_ENDPOINT'] ||= "https://api.travis-ci.com"
+ ENV['PAGES_ENDPOINT'] ||= "https://billing.travis-ci.com"
+ ENV['BILLING_ENDPOINT'] ||= "https://billing.travis-ci.com"
+
+ ENV['SSH_KEY_ENABLED'] = 'true' unless ENV.has_key?('SSH_KEY_ENABLED')
+ ENV['CACHES_ENABLED'] = 'true' unless ENV.has_key?('CACHES_ENABLED')
+
+ ENV['PUSHER_KEY'] ||= "59236bc0716a551eab40"
+ ENV['GA_CODE'] ||= "UA-24868285-5"
+
+ ENV['CODE_CLIMATE_URL'] ||= "https://codeclimate.com/partners/travisci"
+ ENV['CODE_CLIMATE'] = 'true' unless ENV.has_key?('CODE_CLIMATE')
+end
+
run Travis::Web::App.build(
environment: ENV['RACK_ENV'] || 'development',
api_endpoint: ENV['API_ENDPOINT'],
@@ -50,5 +65,7 @@ run Travis::Web::App.build(
pusher_log_fallback: ENV['PUSHER_LOG_FALLBACK'],
charm_key: ENV['CHARM_KEY'],
customer_io_site_id: ENV['CUSTOMER_IO_SITE_ID'],
- pro: ENV['TRAVIS_PRO']
+ pro: ENV['TRAVIS_PRO'],
+ code_climate: ENV['CODE_CLIMATE'],
+ code_climate_url: ENV['CODE_CLIMATE_URL']
)
diff --git a/public/index.html b/public/index.html
index c0ac7692..49608596 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,6 +8,7 @@
<meta name="travis.ssh_key_enabled" value="false">
<meta name="travis.pusher_key" value="5df8ac576dcccf4fd076">
<meta name="travis.pusher_host" value="ws.pusherapp.com">
+ <meta name="travis.pusher_path" value="">
<meta name="travis.ga_code" value="UA-24868285-1">
<meta name="travis.caches_enabled" value="false">
<meta name="travis.pusher_log_fallback" value="false">