From 00fa7f5e86c76e8c8704d75f8fcbb76175bb9892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 2 Apr 2015 07:51:16 +0200 Subject: [PATCH] Removed unusued config, updated sample config with session config --- conf/defaults.ini | 4 ---- conf/sample.ini | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index d328733abc9..ff159dc8531 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -57,10 +57,6 @@ cookie_name = grafana_sess cookie_secure = false ; Session life time, default is 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] ; default admin user, created on startup diff --git a/conf/sample.ini b/conf/sample.ini index 3d4f6cf8e57..e33938dbef7 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -42,6 +42,22 @@ ssl_mode = disable ; For "sqlite3" only 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] ; default admin user, created on startup admin_user = admin