Merge pull request #5 from Perceptyx/pid_file_dir

Include PID_FILE_DIR config
2017-09-14 11:59:05 -03:00 · 2017-09-14 11:59:05 -03:00 · 1aab527af3
parent 698c59aa66 2878e14395
commit 1aab527af3
2 changed files with 3 additions and 2 deletions
--- a/grafana/files/default
+++ b/grafana/files/default
@ -19,4 +19,5 @@ RESTART_ON_UPGRADE=true

 PLUGINS_DIR={{ server.path.data }}/plugins

-PID_FILE={{ server.path.pidfile }}
+# Only used on systemd systems
+PID_FILE_DIR={{ server.path.pid_file_dir }}
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@ -10,7 +10,7 @@ Debian:
    home: /usr/share/grafana
    data: /var/lib/grafana
    logs: /var/log/grafana
-    pidfile: /var/run/grafana-server.pid
+    pid_file_dir: /var/run/grafana
  bind:
    address: 0.0.0.0
    port: 3000