Просмотр исходного кода

Removed unusued config, updated sample config with session config

Torkel Ödegaard 10 лет назад
Родитель
Сommit
00fa7f5e86
2 измененных файлов с 16 добавлено и 4 удалено
  1. 0 4
      conf/defaults.ini
  2. 16 0
      conf/sample.ini

+ 0 - 4
conf/defaults.ini

@@ -57,10 +57,6 @@ cookie_name = grafana_sess
 cookie_secure = false
 cookie_secure = false
 ; Session life time, default is 86400
 ; Session life time, default is 86400
 session_life_time = 86400
 session_life_time = 86400
-; session id hash func, Either "sha1", "sha256" or "md5" default is sha1
-session_id_hashfunc = sha1
-; Session hash key, default is use random string
-session_id_hashkey =
 
 
 [security]
 [security]
 ; default admin user, created on startup
 ; default admin user, created on startup

+ 16 - 0
conf/sample.ini

@@ -42,6 +42,22 @@ ssl_mode = disable
 ; For "sqlite3" only
 ; For "sqlite3" only
 path = /opt/grafana/data/grafana.db
 path = /opt/grafana/data/grafana.db
 
 
+[session]
+; Either "memory", "file", "redis", "mysql", default is "memory"
+provider = file
+; Provider config options
+; memory: not have any config yet
+; file: session file path, e.g. `data/sessions`
+; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana`
+; mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name`
+provider_config = /opt/grafana/data/sessions
+; Session cookie name
+cookie_name = grafana_sess
+; If you use session in https only, default is false
+cookie_secure = false
+; Session life time, default is 86400
+session_life_time = 86400
+
 [security]
 [security]
 ; default admin user, created on startup
 ; default admin user, created on startup
 admin_user = admin
 admin_user = admin