Merge pull request #7487 from elastic/jasper/backport/7387/4.x

[backport] PR #7387 to 4.x
elastic · Jun 16, 2016 · 6ccfc95 · 6ccfc95
2 parents d1df2c5 + 5a8ce05
commit 6ccfc95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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';