more work on refining config loading, and packaging

packaging/deb/control/postinst

@@ -30,12 +30,12 @@ case "$1" in
 		"$GRAFANA_USER"
 	fi
 
-	# Set user permissions on /var/log/grafana, /opt/grafana/data
-	mkdir -p /var/log/grafana /opt/grafana/data
-	chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /opt/grafana/data
-	chmod 755 /var/log/grafana /opt/grafana/data
+	# Set user permissions on /var/log/grafana, /var/lib/grafana
+	mkdir -p /var/log/grafana /var/lib/grafana
+	chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
+	chmod 755 /var/log/grafana /var/lib/grafana
 
-	# configuration files should not be modifiable by elasticsearch user, as this can be a security issue
+	# configuration files should not be modifiable by grafana user, as this can be a security issue
 	chown -Rh root:root /etc/grafana/*
 	chmod 755 /etc/grafana
 	find /etc/grafana -type f -exec chmod 644 {} ';'

packaging/deb/default/grafana-server

@@ -1,14 +1,17 @@
-
 GRAFANA_USER=grafana
+
 GRAFANA_GROUP=grafana
 
+GRAFANA_HOME=/usr/share/grafana
+
 LOG_DIR=/var/log/grafana
-GRAFANA_HOME=/opt/grafana
-DATA_DIR=/opt/grafana/data
-WORK_DIR=/opt/grafana
+
+DATA_DIR=/var/lib/grafana
+
 MAX_OPEN_FILES=10000
 
 CONF_DIR=/etc/grafana
+
 CONF_FILE=/etc/grafana/grafana.ini
 
 RESTART_ON_UPGRADE=true

packaging/deb/init.d/grafana-server

@@ -20,9 +20,9 @@
 #  3. Centos with initscripts package installed
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=grafana
+NAME=grafana-server
 DESC="Grafana Server"
-DEFAULT=/etc/default/$NAME
+DEFAULT=/etc/default/grafana-server
 
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
@@ -37,11 +37,11 @@ fi
 
 GRAFANA_USER=grafana
 GRAFANA_GROUP=grafana
-GRAFANA_HOME=/opt/$NAME
-CONF_DIR=/etc/$NAME
+GRAFANA_HOME=/usr/share/grafana
+CONF_DIR=/etc/grafana
 WORK_DIR=$GRAFANA_HOME
-DATA_DIR=$GRAFANA_HOME/data
-LOG_DIR=/var/log/$NAME
+DATA_DIR=/var/lib/grafana
+LOG_DIR=/var/log/grafana
 CONF_FILE=$CONF_DIR/grafana.ini
 MAX_OPEN_FILES=10000
 
@@ -51,8 +51,8 @@ if [ -f "$DEFAULT" ]; then
 fi
 
 PID_FILE=/var/run/$NAME.pid
-DAEMON=$GRAFANA_HOME/bin/grafana
-DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} --default-data-path=${DATA_DIR} --default-log-path=${LOG_DIR} web"
+DAEMON=/usr/bin/grafana-server
+DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR}"
 
 # Check DAEMON exists
 test -x $DAEMON || exit 0

packaging/deb/systemd/grafana-server.service

@@ -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