Merge pull request #7387 from jbudz/issues/6728

[packages] Set publish prefix kibana/major_version.x
elastic · Jun 15, 2016 · b32949d · b32949d
2 parents 314e095 + 41004fd
commit b32949d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/docs/index.asciidoc b/docs/index.asciidoc
@@ -8,6 +8,7 @@
 :k4pull: https://github.com/elastic/kibana/pull/
 :version: master
 :esversion: master
+:packageversion: master
 
 include::introduction.asciidoc[]
 

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",subs="attributes"]
 --------------------------------------------------
-echo "deb http://packages.elastic.co/kibana/{version}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
+echo "deb https://packages.elastic.co/kibana/{packageversion}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
 --------------------------------------------------
 +
 [WARNING]
@@ -82,11 +82,11 @@ rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
 +
 ["source","sh",subs="attributes"]
 --------------------------------------------------
-[kibana-{version}]
-name=Kibana repository for {version}.x packages
-baseurl=http://packages.elastic.co/kibana/{version}/centos
+[kibana-{packageversion}]
+name=Kibana repository for {packageversion} packages
+baseurl=https://packages.elastic.co/kibana/{packageversion}/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('build.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';