Merge 69e22ffac2 into f91843bc99

grafana/files/grafana.ini

@@ -11,11 +11,11 @@
 [paths]
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
 #
-;data = /var/lib/grafana
+data = {{ server.paths.data }}
 #
 # Directory where grafana can store logs
 #
-;logs = /var/log/grafana
+logs = {{ server.paths.logs }}
 
 #################################### Server ####################################
 [server]
@@ -288,4 +288,3 @@ path = {{ server.dashboards.path }}
 ;enabled = false
 ;path = /var/lib/grafana/dashboards
 {%- endif %}
-

grafana/map.jinja

@@ -4,6 +4,9 @@ Debian:
   pkgs:
   - grafana
   service: grafana-server
+  paths:
+    data: /var/lib/grafana
+    logs: /var/log/grafana
   bind:
     address: 0.0.0.0
     port: 3000