diff options
| author | Andrey Nering <andrey.nering@gmail.com> | 2016-12-27 13:14:20 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 13:14:20 -0200 |
| commit | edfa76d3f5a9f6f42c2b6f660a1be84a8088c5dd (patch) | |
| tree | 0a6f7e7baa4a5f54fbb36e627f87fdd4701399ca | |
| parent | ba85f68ea8a8b1953cf6700f9e1a5c4a8eecba0d (diff) | |
| parent | a0f5471e218f649fe30d25026b7b70e0282d251e (diff) | |
| download | gitea-edfa76d3f5a9f6f42c2b6f660a1be84a8088c5dd.tar.gz gitea-edfa76d3f5a9f6f42c2b6f660a1be84a8088c5dd.zip | |
Merge pull request #508 from joubertredrat/fix-cookie-name
Fix default cookie name
| -rw-r--r-- | conf/app.ini | 4 | ||||
| -rw-r--r-- | modules/setting/setting.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/app.ini b/conf/app.ini index cef7ae6d5b..ab8e63fdcb 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -101,7 +101,7 @@ START_SSH_SERVER = false ; Domain name to be exposed in clone URL SSH_DOMAIN = %(DOMAIN)s ; Network interface builtin SSH server listens on -SSH_LISTEN_HOST = +SSH_LISTEN_HOST = ; Port number to be exposed in clone URL SSH_PORT = 22 ; Port number builtin SSH server listens on @@ -251,7 +251,7 @@ PROVIDER = memory ; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table` PROVIDER_CONFIG = data/sessions ; Session cookie name -COOKIE_NAME = i_like_gogits +COOKIE_NAME = i_like_gitea ; If you use session in https only, default is false COOKIE_SECURE = false ; Enable set cookie, default is true diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 105d33371e..fa6d64e214 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -937,7 +937,7 @@ func newSessionService() { SessionConfig.Provider = Cfg.Section("session").Key("PROVIDER").In("memory", []string{"memory", "file", "redis", "mysql"}) SessionConfig.ProviderConfig = strings.Trim(Cfg.Section("session").Key("PROVIDER_CONFIG").String(), "\" ") - SessionConfig.CookieName = Cfg.Section("session").Key("COOKIE_NAME").MustString("i_like_gogits") + SessionConfig.CookieName = Cfg.Section("session").Key("COOKIE_NAME").MustString("i_like_gitea") SessionConfig.CookiePath = AppSubURL SessionConfig.Secure = Cfg.Section("session").Key("COOKIE_SECURE").MustBool(false) SessionConfig.Gclifetime = Cfg.Section("session").Key("GC_INTERVAL_TIME").MustInt64(86400) |