dont tell faraday to get a custom ca file, hopefully heroku does magic to make sure they work
This commit is contained in:
parent
c1b46e557f
commit
084ed0e838
1 changed files with 3 additions and 1 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue