removes old cookie auth configuration

conf/defaults.ini

@@ -116,9 +116,6 @@ cookie_name = grafana_session
 # If you want login cookies to be https only. default is false
 cookie_secure = false
 
-# Logged in user name
-cookie_username = grafana_user
-
 # How many days an session can be unused before we inactivate it
 login_remember_days = 7
 
@@ -198,11 +195,6 @@ admin_password = admin
 # used for signing
 secret_key = SW2YcwTIb9zpOOhoPsMm
 
-# Auto-login remember days
-login_remember_days = 7
-cookie_username = grafana_user
-cookie_remember_name = grafana_remember
-
 # disable gravatar profile images
 disable_gravatar = false
 

conf/sample.ini

@@ -112,9 +112,6 @@ log_queries =
 # If you want login cookies to be https only. default is false
 ;cookie_secure = false
 
-# Logged in user name
-;cookie_username = grafana_user
-
 # How many days an session can be unused before we inactivate it
 ;login_remember_days = 7
 
@@ -184,11 +181,6 @@ log_queries =
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm
 
-# Auto-login remember days
-;login_remember_days = 7
-;cookie_username = grafana_user
-;cookie_remember_name = grafana_remember
-
 # disable gravatar profile images
 ;disable_gravatar = false
 

pkg/services/auth/auth_token_test.go

@@ -303,7 +303,6 @@ func createTestContext(t *testing.T) *testContext {
 	}
 
 	UrgentRotateTime = time.Minute
-	setting.LogInRememberDays = 7
 
 	return &testContext{
 		sqlstore:     sqlstore,

pkg/setting/setting.go

@@ -83,9 +83,6 @@ var (
 
 	// Security settings.
 	SecretKey                        string
-	LogInRememberDays                int
-	CookieUserName                   string
-	CookieRememberName               string
 	DisableGravatar                  bool
 	EmailCodeValidMinutes            int
 	DataProxyWhiteList               map[string]bool
@@ -603,9 +600,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	// read security settings
 	security := iniFile.Section("security")
 	SecretKey = security.Key("secret_key").String()
-	LogInRememberDays = security.Key("login_remember_days").MustInt()
-	CookieUserName = security.Key("cookie_username").String()
-	CookieRememberName = security.Key("cookie_remember_name").String()
 	DisableGravatar = security.Key("disable_gravatar").MustBool(true)
 	cfg.DisableBruteForceLoginProtection = security.Key("disable_brute_force_login_protection").MustBool(false)
 	DisableBruteForceLoginProtection = cfg.DisableBruteForceLoginProtection