Docs updates and update to tar package

grafana · Apr 20, 2015 · 3d8beb9 · 3d8beb9
1 parent 123ea33
commit 3d8beb9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
@@ -10,20 +10,23 @@ page_keywords: grafana, installation, debian, ubuntu, guide
 
 Description | Download
 ------------ | -------------
-.deb for Debian-based Linux | [grafana_2.0.0-beta3_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb)
+.deb for Debian-based Linux | [grafana_2.0.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0_amd64.deb)
 
 ## Install
 
-    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0_amd64.deb
     $ sudo apt-get install -y adduser libfontconfig
-    $ sudo dpkg -i grafana_2.0.0-beta3_amd64.deb
+    $ sudo dpkg -i grafana_2.0.0_amd64.deb
 
 ## APT Repository
 Add the following line to your `/etc/apt/sources.list`
 
-    deb https://packagecloud.io/grafana/testing/debian/ wheezy main
+    deb https://packagecloud.io/grafana/stable/debian/ wheezy main
+
+Use the above line even if you are on Ubuntu or another debian version. There is also testing
+repository if you want beta or release candidates.
 
-Use the above line even if you are on Ubuntu or another debian version.
+    deb https://packagecloud.io/grafana/testing/debian/ wheezy main
 
 Then add the [Package Cloud](https://packagecloud.io/grafana) key used to sign packages.
 

diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
@@ -10,32 +10,36 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide
 
 Description | Download
 ------------ | -------------
-.RPM for Fedora / RHEL / CentOS Linux | [grafana-2.0.0_beta3-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.0.0_beta3-1.x86_64.rpm)
+.RPM for Fedora / RHEL / CentOS Linux | [grafana-2.0.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.0.0-1.x86_64.rpm)
 
 ## Install
 You can install using yum
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-2.0.0_beta3-1.x86_64.rpm
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-2.0.0-1.x86_64.rpm
 
 Or manually using `rpm`
 
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-2.0.0_beta3-1.x86_64.rpm
+    $ sudo rpm -Uvh grafana-2.0.0-1.x86_64.rpm
 
 ## YUM Repository
 
 Add the following to a new file at `/etc/yum.repos.d/grafana.repo`
 
     [grafana]
     name=grafana
-    baseurl=https://packagecloud.io/grafana/testing/el/6/$basearch
+    baseurl=https://packagecloud.io/grafana/stable/el/6/$basearch
     repo_gpgcheck=1
     gpgcheck=0
     enabled=1
     gpgkey=https://packagecloud.io/gpg.key
     sslverify=1
     sslcacert=/etc/pki/tls/certs/ca-bundle.crt
 
+There is also testing repository if you want beta or release candidates.
+
+    baseurl=https://packagecloud.io/grafana/testing/el/6/$basearch
+
 Install Grafana
 
     $ sudo yum install grafana

diff --git a/tasks/options/compress.js b/tasks/options/compress.js
@@ -1,4 +1,5 @@
 module.exports = function(config) {
+  'use strict';
 
   var task = {
     release: {
@@ -10,7 +11,7 @@ module.exports = function(config) {
           expand: true,
           cwd: '<%= tempDir %>',
           src: ['**/*'],
-          dest: '<%= pkg.name %>/',
+          dest: '<%= pkg.name %>-<%= pkg.version %>/',
         },
         {
           expand: true,