Преглед изворни кода

docs: updated debian and centos repo.

Leonard Gram пре 7 година
родитељ
комит
dd6f606cda
2 измењених фајлова са 11 додато и 26 уклоњено
  1. 6 15
      docs/sources/installation/debian.md
  2. 5 11
      docs/sources/installation/rpm.md

+ 6 - 15
docs/sources/installation/debian.md

@@ -34,32 +34,23 @@ sudo dpkg -i grafana_<version>_amd64.deb
 Example:
 Example:
 
 
 ```bash
 ```bash
-wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.1.4_amd64.deb
+wget https://dl.grafana.com/oss/release/grafana_5.4.2_amd64.deb
 sudo apt-get install -y adduser libfontconfig
 sudo apt-get install -y adduser libfontconfig
-sudo dpkg -i grafana_5.1.4_amd64.deb
+sudo dpkg -i grafana_5.4.2_amd64.deb
 ```
 ```
 
 
 ## APT Repository
 ## APT Repository
 
 
-Add the following line to your `/etc/apt/sources.list` file.
+Create a file `/etc/apt/sources.list.d/grafana.list` and add the following to it.
 
 
 ```bash
 ```bash
-deb https://packagecloud.io/grafana/stable/debian/ stretch main
+deb https://packages.grafana.com/oss/deb stable main
 ```
 ```
 
 
-Use the above line even if you are on Ubuntu or another Debian version.
-There is also a testing repository if you want beta or release
-candidates.
+Use the above line even if you are on Ubuntu or another Debian version. Then add our gpg key. This allows you to install signed packages.
 
 
 ```bash
 ```bash
-deb https://packagecloud.io/grafana/testing/debian/ stretch main
-```
-
-Then add the [Package Cloud](https://packagecloud.io/grafana) key. This
-allows you to install signed packages.
-
-```bash
-curl https://packagecloud.io/gpg.key | sudo apt-key add -
+curl https://packages.grafana.com/gpg.key | sudo apt-key add -
 ```
 ```
 
 
 Update your Apt repositories and install Grafana
 Update your Apt repositories and install Grafana

+ 5 - 11
docs/sources/installation/rpm.md

@@ -32,7 +32,7 @@ $ sudo yum install <rpm package url>
 Example:
 Example:
 
 
 ```bash
 ```bash
-$ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.4-1.x86_64.rpm
+$ sudo yum install https://dl.grafana.com/oss/release/grafana-5.4.2-1.x86_64.rpm
 ```
 ```
 
 
 Or install manually using `rpm`. First execute
 Or install manually using `rpm`. First execute
@@ -44,7 +44,7 @@ $ wget <rpm package url>
 Example:
 Example:
 
 
 ```bash
 ```bash
-$ wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.4-1.x86_64.rpm
+$ wget https://dl.grafana.com/oss/release/grafana-5.4.2-1.x86_64.rpm
 ```
 ```
 
 
 ### On CentOS / Fedora / Redhat:
 ### On CentOS / Fedora / Redhat:
@@ -67,21 +67,15 @@ Add the following to a new file at `/etc/yum.repos.d/grafana.repo`
 ```bash
 ```bash
 [grafana]
 [grafana]
 name=grafana
 name=grafana
-baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch
+baseurl=https://packages.grafana.com/oss/rpm
 repo_gpgcheck=1
 repo_gpgcheck=1
 enabled=1
 enabled=1
 gpgcheck=1
 gpgcheck=1
-gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
+gpgkey=https://packages.grafana.com/gpg.key
 sslverify=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
 ```
 ```
 
 
-There is also a testing repository if you want beta or release candidates.
-
-```bash
-baseurl=https://packagecloud.io/grafana/testing/el/7/$basearch
-```
-
 Then install Grafana via the `yum` command.
 Then install Grafana via the `yum` command.
 
 
 ```bash
 ```bash
@@ -91,7 +85,7 @@ $ sudo yum install grafana
 ### RPM GPG Key
 ### RPM GPG Key
 
 
 The RPMs are signed, you can verify the signature with this [public GPG
 The RPMs are signed, you can verify the signature with this [public GPG
-key](https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana).
+key](https://packages.grafana.com/gpg.key).
 
 
 ## Package details
 ## Package details