diff options
| author | Ben Kochie <superq@gmail.com> | 2021-02-16 17:20:07 +0100 |
|---|---|---|
| committer | Ben Kochie <superq@gmail.com> | 2021-02-16 17:20:07 +0100 |
| commit | c53dcd0055d765db67e61e7c351c6188af16cd56 (patch) | |
| tree | ebe4deb35040347471f76faab27fe7ea0a58f16a /cmd | |
| parent | 402d8b1258e4cb3202de6424fda531471886f559 (diff) | |
| download | gitlab-shell-c53dcd0055d765db67e61e7c351c6188af16cd56.tar.gz | |
Refactor Config defaults
Use "omitempty" to allow defaults in the config file to be correctly
passed. Without this, explicitly setting an empty default like an empty
string will not work. Needed in order to allow explicitly disabling some
settings.
Related to: https://gitlab.com/gitlab-org/gitlab-shell/-/issues/121
Signed-off-by: Ben Kochie <superq@gmail.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitlab-sshd/main.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go index b9ea67a..443c142 100644 --- a/cmd/gitlab-sshd/main.go +++ b/cmd/gitlab-sshd/main.go @@ -42,7 +42,6 @@ func main() { } } overrideConfigFromEnvironment(cfg) - cfg.ApplyServerDefaults() if err := cfg.IsSane(); err != nil { if *configDir == "" { log.Warn("note: no config-dir provided, using only environment variables") |