From 648d9e253c1924b832248f26fee42b2fb64dc3bc Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sat, 22 Feb 2020 09:05:26 +0800 Subject: 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 --- internal/auth/auth.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/auth') diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 41aba23d..0270b6b4 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -15,7 +15,7 @@ import ( "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" - "gogs.io/gogs/internal/setting" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/tool" ) @@ -90,8 +90,8 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic uid, isTokenAuth := SignedInID(ctx, sess) if uid <= 0 { - if setting.Service.EnableReverseProxyAuth { - webAuthUser := ctx.Req.Header.Get(setting.ReverseProxyAuthUser) + if conf.Service.EnableReverseProxyAuth { + webAuthUser := ctx.Req.Header.Get(conf.ReverseProxyAuthUser) if len(webAuthUser) > 0 { u, err := db.GetUserByName(webAuthUser) if err != nil { @@ -101,7 +101,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic } // Check if enabled auto-registration. - if setting.Service.EnableReverseProxyAutoRegister { + if conf.Service.EnableReverseProxyAutoRegister { u := &db.User{ Name: webAuthUser, Email: gouuid.NewV4().String() + "@localhost", -- cgit v1.2.3