updated to install docs

docs/sources/installation/index.md

@@ -12,13 +12,15 @@ to build one your self, read [build from source](../project/building_from_source
 ## Ubuntu & Debian
 Start by [downloading](http://grafana.org/download) the latest `.deb` package.
 
-To install the package:
+To install the package
 
+    $ sudo apt-get install -y adduser libfontconfig
     $ sudo dpkg -i grafana_latest_amd64.deb
 
 ## Redhat & Centos
 Start by [downloading](http://grafana.org/download) the latest `.rpm` package.
 
+    $ sudo yum install initscripts fontconfig
     $ sudo rpm -Uvh grafana-latest-1.x86_64.rpm
 
 On Redhat/RHEL 5.10 you need to add the grafana user before executing the above.
@@ -29,21 +31,27 @@ Execute this to add a grafana user:
 ### Package details
 The `.deb` and the `rpm` package install will do the following
 
-- Install binaries and frontend files under `/opt/grafana/versions/<version>`
-- Symlink dir `/opt/grafana/current` to `/opt/grafana/versions/<version>`
-- Symlink `/etc/init.d/grafana` to `/opt/grafana/current/scripts/init.sh`
-- Add config file to `/etc/grafana/grafana.ini` , this is where you specify your config settings
-- Default configuration is in `/opt/grafana/current/conf/defaults.ini`, do not modify that file
+- Install binary to `/usr/sbin/grafana-server`
+- Init.d script to `/etc/init.d/grafana-server`
+- Default file (environment vars) to `/etc/default/grafana-server` (deb package) or `/etc/sysconfig/grafana-server` (for the rpm package)
+- Configuration file to `/etc/grafana/grafana.ini`
+- Systemd service (if systemd is available) name `grafana-server.service`
 - The default configuration specifies log file at `/var/log/grafana/grafana.log`
-- The default configuration specifies sqlite3 db at `/opt/grafana/data/grafana.db`
+- The default configuration specifies sqlite3 db at `/var/lib/grafana/grafana.db`
 
-### Start the backend & web server
+### Start the server (init.d service)
 
-- Start grafana by `sudo service grafana start`
-- This will start the grafana process as the `grafana` user (created during package install)
+- Start grafana by `sudo service grafana-server start`
+- This will start the grafana-server process as the `grafana` user (created during package install)
 - Default http port is `3000`, and default user is admin/admin
 
-## Manual install from tar file
+### Start the server (via systemd)
+
+    $ systemctl daemon-reload
+    $ systemctl start grafana-server
+    $ systemctl status grafana-server
+
+## Manual install from binary tar file
 Start by [downloading](http://grafana.org/download/builds) the latest `.tar.gz` file and extract it.
 This will extract into a folder named after the version you downloaded. This folder contains all files required to run grafana.
 There are no init scripts or install scripts in this package.
@@ -64,7 +72,7 @@ list of repositories for different provisioning systems
 
 Grafana has an offical docker container.
 
-    $ docker run -i -p 3000:3000 grafana/grafana:develop
+    $ docker run -i -p 3000:3000 grafana/grafana
 
 All grafana configuration settings can be defined using ENVIRONMENT variables, this is especially useful when using the
 above container.
@@ -86,7 +94,3 @@ In the above example I map the data folder and set a config option via an `ENV`
 The backend web server has a number of configuration options. Go the [Configuration](configuration) page for details
 on all those options.
 
-
-
-
-