diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-06-28 14:58:59 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-06-28 14:58:59 +0800 |
| commit | 86e2627175ceaed544dabbbef40d9197995c2bd4 (patch) | |
| tree | 820eb7762ca0d3fa4f14e657a1ce2aa9f4b73617 /modules/setting/setting.go | |
| parent | e5ae41e21f7fa1e25f04a28d907b89c78196c824 (diff) | |
| parent | ee9b7f322ff4c4c14952c2f83fb03e90fa583cad (diff) | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
models/update.go
routers/repo/http.go
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index cb7734bb..f03aa8ae 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -47,12 +47,12 @@ var ( StaticRootPath string // Security settings. - InstallLock bool - SecretKey string - LogInRememberDays int - CookieUserName string - CookieRememberName string - ReverseProxyAuthUid string + InstallLock bool + SecretKey string + LogInRememberDays int + CookieUserName string + CookieRememberName string + ReverseProxyAuthUser string // Webhook settings. WebhookTaskInterval int @@ -164,7 +164,7 @@ func NewConfigContext() { LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS") CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME") CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME") - ReverseProxyAuthUid = Cfg.MustValue("security", "REVERSE_PROXY_AUTHENTICATION_UID", "X-WEBAUTH-UID") + ReverseProxyAuthUser = Cfg.MustValue("security", "REVERSE_PROXY_AUTHENTICATION_USER", "X-WEBAUTH-USER") RunUser = Cfg.MustValue("", "RUN_USER") curUser := os.Getenv("USER") |