Skip to content

Commit

Permalink
Set httpi adapter (#3641)
Browse files Browse the repository at this point in the history
* merge conflict

* Force HTTPI to use net_http as an adapter

* remove ca_cert setting for vbms
  • Loading branch information
charleystran authored Dec 13, 2019
1 parent d38cddb commit 40f52ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 4 additions & 0 deletions config/initializers/httpi.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# frozen_string_literal: true

# since the httpclient gem uses its own certificate store, force HTTPI to use :net_http
HTTPI.adapter = :net_http
1 change: 0 additions & 1 deletion config/initializers/vbms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
if Settings.vbms.present?
ENV['CONNECT_VBMS_BASE_URL'] = Settings.vbms.url
ENV['CONNECT_VBMS_CACERT'] = Settings.vbms.ca_cert
ENV['CONNECT_VBMS_CERT'] = Settings.vbms.cert
ENV['CONNECT_VBMS_CLIENT_KEYFILE'] = Settings.vbms.client_keyfile
ENV['CONNECT_VBMS_KEYPASS'] = Settings.vbms.keypass
Expand Down

0 comments on commit 40f52ee

Please sign in to comment.