Skip to content

Commit

Permalink
Backport PR #7387
Browse files Browse the repository at this point in the history
---------

**Commit 1:**
[packages] Set publish prefix kibana/major_version.x

* Original sha: 9d809f3
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-06-07T19:22:23Z

**Commit 2:**
[docs] Use https on package links

* Original sha: f9a5cb3
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-06-07T19:27:11Z

**Commit 3:**
[docs] Update package version

* Original sha: 41004fd
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-06-07T19:35:48Z
  • Loading branch information
jbudz committed Jun 16, 2016
1 parent f368c47 commit 5a8ce05
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions docs/kibana-repositories.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add
+
[source, sh]
--------------------------------------------------
echo "deb http://packages.elastic.co/kibana/{branch}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
echo "deb https://packages.elastic.co/kibana/{branch}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
--------------------------------------------------
+
[WARNING]
Expand Down Expand Up @@ -83,9 +83,9 @@ rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
--------------------------------------------------
[kibana-{branch}]
name=Kibana repository for {branch}.x packages
baseurl=http://packages.elastic.co/kibana/{branch}/centos
baseurl=https://packages.elastic.co/kibana/{branch}/centos
gpgcheck=1
gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch
enabled=1
--------------------------------------------------
+
Expand Down
2 changes: 1 addition & 1 deletion tasks/config/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default (grunt) => {
const VERSION = grunt.config.get('pkg.version');

const FOLDER_STAGING = `kibana/staging/${VERSION.match(/\d\.\d\.\d/)[0]}-XXXXXXX/repos/${VERSION.match(/\d\./)[0]}x`;
const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\.\d/)[0]}`;
const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\./)[0]}x`;

const FOLDERNAME_DEB = 'debian';
const FOLDERNAME_RPM = 'centos';
Expand Down

0 comments on commit 5a8ce05

Please sign in to comment.