diff options
| author | Max Resnick <max@ofmax.li> | 2024-08-30 23:06:18 -0700 |
|---|---|---|
| committer | Max Resnick <max@ofmax.li> | 2024-08-30 23:06:18 -0700 |
| commit | 09e8ea66b75e8ac6e90942ab37814e9e1633afac (patch) | |
| tree | e56a5d71923e6a3b0a44f732629fafedfe6f971a /internal/admin/model.go | |
| parent | 4d55e5d1dc56c421344f88aebf01deec2daa7bbe (diff) | |
| download | go-git-server-09e8ea66b75e8ac6e90942ab37814e9e1633afac.tar.gz | |
fix: handle basepath correctly
Diffstat (limited to 'internal/admin/model.go')
| -rw-r--r-- | internal/admin/model.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/internal/admin/model.go b/internal/admin/model.go index cce61ce..84b3c89 100644 --- a/internal/admin/model.go +++ b/internal/admin/model.go @@ -166,11 +166,13 @@ func loadServerConfig(mgmtRepo bool, baseDir, configPath string) (*ServerRepos, err error ) if mgmtRepo { + slog.Debug("loading server config from git", "baseDir", baseDir, "configPath", configPath) configBytes, err = loadConfigFromGit(baseDir, configPath) if err != nil { return &ServerRepos{}, err } } else { + slog.Debug("loading server config from a file") configBytes, err = loadLocalFile(configPath) if err != nil { slog.Error("Local server config couldn't be loaded") @@ -182,6 +184,7 @@ func loadServerConfig(mgmtRepo bool, baseDir, configPath string) (*ServerRepos, if err != nil { return &ServerRepos{}, errors.New("could not parse gitserver config") } + config.basePath = baseDir return config, nil } |