Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2020-07-06 09:10:47 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-07-06 09:10:47 +0300
commit83c5f147b59e687b6cd41928a6cc27307377e9ae (patch)
tree6a1d90baf47d0904fe6d434c66fcc6728cdf8c8e /internal/httptransport
parent4b88e04cca7a863b11fc72af6e73a0eafa32b190 (diff)
Best effort to load cert file and cert dir
Diffstat (limited to 'internal/httptransport')
-rw-r--r--internal/httptransport/transport.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/httptransport/transport.go b/internal/httptransport/transport.go
index c0eaafea..b4f82b6f 100644
--- a/internal/httptransport/transport.go
+++ b/internal/httptransport/transport.go
@@ -72,15 +72,14 @@ func loadPool() {
return
}
+ // SSL_CERT_FILE is not respected by OSX, need to load this manually
if err := loadSSLCertFile(); err != nil {
log.WithError(err).Error("failed to read SSL_CERT_FILE")
- return
}
// SSL_CERT_DIR is not respected by OSX, need to load this manually
if err := loadSSLCertDir(); err != nil {
- log.WithError(err).Warn("failed to load SSL_CERT_DIR")
- return
+ log.WithError(err).Error("failed to load SSL_CERT_DIR")
}
}