[ARVADOS] updated: e4960a9fc343876bfa89f6354d4ac8867a949609

git at public.curoverse.com git at public.curoverse.com
Wed Jan 8 04:18:42 EST 2014


Summary of changes:
 apps/workbench/app/models/arvados_api_client.rb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

       via  e4960a9fc343876bfa89f6354d4ac8867a949609 (commit)
      from  36ca0d3ede8554a229d6872b151b7e79ce959ba9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e4960a9fc343876bfa89f6354d4ac8867a949609
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 8 01:16:50 2014 -0800

    Use operating system's bundled CA certificates if available.
    
    refs #1782

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 9c5fab9..21e86da 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -16,6 +16,9 @@ class ArvadosApiClient
         @@api_client = HTTPClient.new
         if Rails.configuration.arvados_insecure_https
           @@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        else
+          # Use system CA certificates
+          @@api_client.ssl_config.add_trust_ca('/etc/ssl/certs')
         end
       end
     end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list