diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2020-10-19 09:16:47 +0000 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2020-10-19 09:16:47 +0000 |
| commit | c09bdad64dc5ae1a57c61a435edb62b5f9a7c3a8 (patch) | |
| tree | df79ee09d7dfa952589d3bd8dbab61f2f3c2cfb9 /internal/command/command.go | |
| parent | 12353c0c1d6ddf57b738b04d86cdd34ce64f2f18 (diff) | |
| parent | 0478ba97950bd6606f823c8a26eeeecf617df653 (diff) | |
| download | gitlab-shell-c09bdad64dc5ae1a57c61a435edb62b5f9a7c3a8.tar.gz | |
Merge branch 'ashmckenzie/set-ssl-cert-dir-env-var' into 'master'
Set SSL_CERT_DIR env var when building command
See merge request gitlab-org/gitlab-shell!423
Diffstat (limited to 'internal/command/command.go')
| -rw-r--r-- | internal/command/command.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/internal/command/command.go b/internal/command/command.go index 7e0617e..a2c5912 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -2,6 +2,7 @@ package command import ( "context" + "os" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals" @@ -34,6 +35,10 @@ func New(e *executable.Executable, arguments []string, config *config.Config, re } if cmd := buildCommand(e, args, config, readWriter); cmd != nil { + if config.SslCertDir != "" { + os.Setenv("SSL_CERT_DIR", config.SslCertDir) + } + return cmd, nil } |