Fixed issue with overriding default config values via command line

packaging/deb/control/postinst

@@ -49,15 +49,15 @@ case "$1" in
         if [ -x /bin/systemctl ] ; then
             echo "### NOT starting on installation, please execute the following statements to configure elasticsearch to start automatically using systemd"
             echo " sudo /bin/systemctl daemon-reload"
-            echo " sudo /bin/systemctl enable grafana.service"
-            echo "### You can start grafana by executing"
-            echo " sudo /bin/systemctl start grafana.service"
+            echo " sudo /bin/systemctl enable grafana-server.service"
+            echo "### You can start grafana-server by executing"
+            echo " sudo /bin/systemctl start grafana-server.service"
 
         elif [ -x /usr/sbin/update-rc.d ] ; then
-            echo "### NOT starting grafana by default on bootup, please execute"
-            echo " sudo update-rc.d grafana defaults 95 10"
-            echo "### In order to start grafana, execute"
-            echo " sudo /etc/init.d/grafana start"
+            echo "### NOT starting grafana-server by default on bootup, please execute"
+            echo " sudo update-rc.d grafana-server defaults 95 10"
+            echo "### In order to start grafana-server, execute"
+            echo " sudo service grafana-server start"
         fi
 	fi
 	;;

packaging/deb/init.d/grafana-server

@@ -22,7 +22,19 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NAME=grafana-server
 DESC="Grafana Server"
-DEFAULT=/etc/default/grafana-server
+DEFAULT=/etc/default/$NAME
+
+GRAFANA_USER=grafana
+GRAFANA_GROUP=grafana
+GRAFANA_HOME=/usr/share/grafana
+CONF_DIR=/etc/grafana
+WORK_DIR=$GRAFANA_HOME
+DATA_DIR=/var/lib/grafana
+LOG_DIR=/var/log/grafana
+CONF_FILE=$CONF_DIR/grafana.ini
+MAX_OPEN_FILES=10000
+PID_FILE=/var/run/$NAME.pid
+DAEMON=/usr/sbin/$NAME
 
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
@@ -35,23 +47,11 @@ if [ -r /etc/default/rcS ]; then
 	. /etc/default/rcS
 fi
 
-GRAFANA_USER=grafana
-GRAFANA_GROUP=grafana
-GRAFANA_HOME=/usr/share/grafana
-CONF_DIR=/etc/grafana
-WORK_DIR=$GRAFANA_HOME
-DATA_DIR=/var/lib/grafana
-LOG_DIR=/var/log/grafana
-CONF_FILE=$CONF_DIR/grafana.ini
-MAX_OPEN_FILES=10000
-
 # overwrite settings from default file
 if [ -f "$DEFAULT" ]; then
 	. "$DEFAULT"
 fi
 
-PID_FILE=/var/run/$NAME.pid
-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

packaging/deb/systemd/grafana-server.service

@@ -9,7 +9,7 @@ EnvironmentFile=/etc/default/grafana
 User=grafana
 Group=grafana
 Type=simple
-ExecStart=/usr/bin/grafana-server                                 \
+ExecStart=/usr/sbin/grafana-server                                \
                             --config=${CONF_FILE}                 \
                             cfg:default.paths.data=${LOG_DIR}     \
                             cfg:default.paths.data=${DATA_DIR}    \