diff options
author | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-12-11 13:41:03 +0200 |
---|---|---|
committer | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-12-11 16:48:24 +0200 |
commit | d0daa1591b7e4dc8cf5ba787420d09cb7e76d8d7 (patch) | |
tree | eeabe10ee363d6a0204ee623bb2a30dcf65ea999 /lib/gitlab/gitaly_client.rb | |
parent | b8e457827e57212abca61f5d295f5e1bde178cb8 (diff) | |
download | gitlab-ce-d0daa1591b7e4dc8cf5ba787420d09cb7e76d8d7.tar.gz |
Rename load_certs and include default cert file
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index cb6601786dc..586d8650db1 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -66,15 +66,20 @@ module Gitlab end end - def self.load_certs - @certs ||= Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*"].map do |cert| + def self.certs + return @certs if @certs + + cert_paths = Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*"] + cert_paths << OpenSSL::X509::DEFAULT_CERT_FILE if File.exist? OpenSSL::X509::DEFAULT_CERT_FILE + + @certs = cert_paths.map do |cert| File.read(cert) end.join("\n") end def self.stub_creds(storage) if URI(address(storage)).scheme == 'tls' - GRPC::Core::ChannelCredentials.new load_certs + GRPC::Core::ChannelCredentials.new certs else :this_channel_is_insecure end |