diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-02-22 09:05:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 09:05:26 +0800 |
| commit | 648d9e253c1924b832248f26fee42b2fb64dc3bc (patch) | |
| tree | 51649fad974cd7284a47d30e412c90e7ab72cd2c /internal/db/login_source.go | |
| parent | 5b14cc6f0b7b661beb2640a94bd15660cdb48587 (diff) | |
conf: overhaul server settings (#5928)
* conf: rename package
* Requires Go 1.12
* Fix lint
* Fix lint
* Overhaul
* db: fix tests
* Save my work
* Fix tests
* Server.UnixSocketPermission
* Server.LocalRootURL
* SSH settings
* Server.OfflineMode
* Save my work
* App.Version
* Remove [server] STATIC_ROOT_PATH
* Server.LandingURL
Diffstat (limited to 'internal/db/login_source.go')
| -rw-r--r-- | internal/db/login_source.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/db/login_source.go b/internal/db/login_source.go index 383e8b46..22b53a62 100644 --- a/internal/db/login_source.go +++ b/internal/db/login_source.go @@ -11,7 +11,7 @@ import ( "net/smtp" "net/textproto" "os" - "path" + "path/filepath" "strings" "sync" "time" @@ -27,8 +27,8 @@ import ( "gogs.io/gogs/internal/auth/github" "gogs.io/gogs/internal/auth/ldap" "gogs.io/gogs/internal/auth/pam" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/db/errors" - "gogs.io/gogs/internal/setting" ) type LoginType int @@ -462,7 +462,7 @@ var localLoginSources = &LocalLoginSources{} // LoadAuthSources loads authentication sources from local files // and converts them into login sources. func LoadAuthSources() { - authdPath := path.Join(setting.CustomPath, "conf/auth.d") + authdPath := filepath.Join(conf.CustomDir(), "conf", "auth.d") if !com.IsDir(authdPath) { return } |