Worked on new deb & rpm packaging and init.d scripts

conf/defaults.ini

@@ -1,6 +1,14 @@
 app_name = Grafana
 app_mode = production
 
+; data_path
+; where rendered png images are temporarily stored
+; file based sessions are stored here (if file based session is configured below)
+; the database is stored here if sqlite3 database is used
+; can be overriden from command line --data-path
+; defaults to `data` path relative to working directory
+data_path =
+
 [server]
 ; protocol (http or https)
 protocol = http
@@ -39,18 +47,18 @@ user = root
 password =
 ; For "postgres" only, either "disable", "require" or "verify-full"
 ssl_mode = disable
-; For "sqlite3" only
-path = data/grafana.db
+; For "sqlite3" only, path relative to data_dir setting
+path = 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`
+; file: session dir path, is relative to grafana data_dir
 ; 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 = data/sessions
+provider_config = sessions
 ; Session cookie name
 cookie_name = grafana_sess
 ; If you use session in https only, default is false
@@ -109,10 +117,14 @@ token_url = https://accounts.google.com/o/oauth2/token
 ; allowed_domains = mycompany.com othercompany.com
 
 [log]
-root_path = data/log
+; root_path
+; for deb or rpm package installs this is specified via command line
+; change it in /etc/default/grafana, it defaults to /var/log/grafana
+; for non package installs (running manually) defaults to `log` dir under data_dir
+root_path =
 ; Either "console", "file", default is "console"
 ; Use comma to separate multiple modes, e.g. "console, file"
-mode = console
+mode = console, file
 ; Buffer length of channel, keep it as it is if you don't know what it is.
 buffer_len = 10000
 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"

conf/sample.ini

@@ -5,6 +5,11 @@
 
 app_mode = production
 
+; data_path (used for sqlite3 db (if that is used), temp png images, and sessions (if file based sessions are used)
+; this option is passed via command line args, override this option in /etc/default/grafana
+; defaults to /opt/grafana/data
+data_path =
+
 [server]
 ; protocol (http or https)
 protocol = http
@@ -42,18 +47,18 @@ user = root
 password =
 ; For "postgres" only, either "disable", "require" or "verify-full"
 ssl_mode = disable
-; For "sqlite3" only
-path = /opt/grafana/data/grafana.db
+; For "sqlite3" only, path is relative to data_dir
+path = 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`
+; file: session file path, e.g. `sessions`, relative to data_dir
 ; 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
+provider_config = sessions
 ; Session cookie name
 cookie_name = grafana_sess
 ; If you use session in https only, default is false
@@ -95,5 +100,8 @@ org_role = Viewer
 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
 level = Info
 mode = console, file
-root_path = /var/log/grafana
+; root_path, this option is passed via command line args,
+; override this option in /etc/default/grafana
+; defaults to /var/log/grafana/
+root_path =