Fix default cookie name

diff --git a/conf/app.ini b/conf/app.ini
index cef7ae6d5b88c8895b0d33071609403342d39d59..ab8e63fdcbe7187799458216655e8881776369cf 100644 (file)
--- 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 105d33371e7853546d05aa08080b8726c8c522d8..fa6d64e2140b6e1d940c5f53cbb5f483a1309285 100644 (file)
--- 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)