From 5a8ce05788da644fbda776c81950c266a9a03fb2 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Thu, 16 Jun 2016 09:40:30 -0500 Subject: [PATCH] Backport PR #7387 --------- **Commit 1:** [packages] Set publish prefix kibana/major_version.x * Original sha: 9d809f3aeaadacedb3d95322305e86c23abe2f27 * Authored by Jonathan Budzenski on 2016-06-07T19:22:23Z **Commit 2:** [docs] Use https on package links * Original sha: f9a5cb32ffff2539dee2f672aee99f93e44007df * Authored by Jonathan Budzenski on 2016-06-07T19:27:11Z **Commit 3:** [docs] Update package version * Original sha: 41004fda0fbd78d232a45fc9c51ba4f87d5918fb * Authored by Jonathan Budzenski on 2016-06-07T19:35:48Z --- docs/kibana-repositories.asciidoc | 6 +++--- tasks/config/packages.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/kibana-repositories.asciidoc b/docs/kibana-repositories.asciidoc index 6a9c2ca196227..b482de80a7d28 100644 --- a/docs/kibana-repositories.asciidoc +++ b/docs/kibana-repositories.asciidoc @@ -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] @@ -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 -------------------------------------------------- + diff --git a/tasks/config/packages.js b/tasks/config/packages.js index 12a121634de79..0fec5b6cd248d 100644 --- a/tasks/config/packages.js +++ b/tasks/config/packages.js @@ -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';