summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Hassan <ahmad.hassan612@gmail.com>2018-11-19 13:57:48 +0200
committerAhmad Hassan <ahmad.hassan612@gmail.com>2018-11-19 13:57:48 +0200
commite13437c6f01b4b47a47628b320c79060d7c60338 (patch)
tree6afe0dc66f765d5aa72aa246dbbda34736c7d1c7
parent73b3da73d62b3b18b6552f2a99f86458d03d628a (diff)
downloadgitlab-ce-support-gitaly-tls.tar.gz
Manually load the certificatessupport-gitaly-tls
-rw-r--r--lib/gitlab/gitaly_client.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 70c89109c61..e00382a557b 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -66,9 +66,16 @@ module Gitlab
end
end
+ def self.load_certs
+ @certs ||= Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*"].map do |cert|
+ File.read(cert)
+ end.join("\n")
+ @certs
+ end
+
def self.stub_creds(storage)
if URI(address(storage)).scheme == 'tls'
- GRPC::Core::ChannelCredentials.new
+ GRPC::Core::ChannelCredentials.new load_certs
else
:this_channel_is_insecure
end