Obey ARVADOS_API_HOST_INSECURE if host came from ARVADOS_API_HOST env var

[arvados.git] / sdk / ruby / lib / arvados.rb

diff --git a/sdk/ruby/lib/arvados.rb b/sdk/ruby/lib/arvados.rb
index a3b93575ec575b4bcb8b609f24101f863a438763..a6bb37ceda59ab462349d29bf692b6cac109c973 100644 (file)
--- a/sdk/ruby/lib/arvados.rb
+++ b/sdk/ruby/lib/arvados.rb
@@ -39,9 +39,8 @@ class Arvados
       ENV['ARVADOS_API_TOKEN'] or
       raise "#{$0}: no :api_token or ENV[ARVADOS_API_TOKEN] provided."
 
-    @suppress_ssl_warnings = opts[:suppress_ssl_warnings] || false
-
-    if @suppress_ssl_warnings
+    if (opts[:api_host] ? opts[:suppress_ssl_warnings] :
+        ENV['ARVADOS_API_HOST_INSECURE'])
       suppress_warnings do
         OpenSSL::SSL.const_set 'VERIFY_PEER', OpenSSL::SSL::VERIFY_NONE
       end