From 084ed0e8385ccbd3b1dc98dd3ac51600fb6b3e1e Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 30 Aug 2011 17:16:51 -0700
Subject: [PATCH] dont tell faraday to get a custom ca file, hopefully heroku
 does magic to make sure they work

---
 config/initializers/faraday.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index 4488fa1ee..1d4a5454e 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -1,8 +1,10 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
+options = {:timeout => 5}
 
-Faraday.default_connection = Faraday::Connection.new( :ssl => {:ca_file => AppConfig[:ca_file]}, :timeout => 5 ) do |b|
+options[:ssl] = {:ca_file => AppConfig[:ca_file]} unless ENV['HEROKU']
+Faraday.default_connection = Faraday::Connection.new(options ) do |b|
   b.use FaradayStack::FollowRedirects
   b.adapter Faraday.default_adapter
 end