more work on refining config loading, and packaging

2015-04-09 17:18:04 +02:00
parent d1767144a8
commit 4c6d7630cd
9 changed files with 179 additions and 203 deletions
@@ -9,10 +9,10 @@ EnvironmentFile=/etc/default/grafana
 User=grafana
 Group=grafana
 Type=simple
-ExecStart=/opt/grafana/bin/grafana            \
-                            --config=$CONF_FILE      \
-                            --default-log-path=$LOG_DIR     \
-                            --default-path-data=$DATA_DIR    \
+ExecStart=/usr/bin/grafana-server                                 \
+                            --config=${CONF_FILE}                 \
+                            cfg:default.paths.data=${LOG_DIR}     \
+                            cfg:default.paths.data=${DATA_DIR}    \
 LimitNOFILE=10000
 TimeoutStopSec=20