From 09e8ea66b75e8ac6e90942ab37814e9e1633afac Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Fri, 30 Aug 2024 23:06:18 -0700 Subject: fix: handle basepath correctly --- internal/admin/model.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'internal/admin/model.go') 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 } -- cgit v1.2.3