Backport data path from PR #7562

elastic · Jul 11, 2016 · 2165805 · 2165805
1 parent 899703f
commit 2165805
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ target
 .htpasswd
 .eslintcache
 installedPlugins
+data
 disabledPlugins
 webpackstats.json
 config/kibana.dev.yml

diff --git a/installedPlugins/.data/.empty → data/.empty b/installedPlugins/.data/.empty → data/.empty
diff --git a/installedPlugins/.empty b/installedPlugins/.empty
diff --git a/src/server/path/index.js b/src/server/path/index.js
@@ -9,7 +9,7 @@ const CONFIG_PATHS = [
 
 const DATA_PATHS = [
   process.env.DATA_PATH,
-  fromRoot('installedPlugins/.data'),
+  fromRoot('data'),
   '/var/lib/kibana'
 ].filter(Boolean);
 

diff --git a/tasks/build/data.js b/tasks/build/data.js
@@ -0,0 +1,5 @@
+export default function (grunt) {
+  grunt.registerTask('_build:data', function () {
+    grunt.file.mkdir('build/kibana/data');
+  });
+};
diff --git a/tasks/build/index.js b/tasks/build/index.js
@@ -11,6 +11,7 @@ module.exports = function (grunt) {
       'babel:build',
       '_build:babelOptions',
       '_build:installedPlugins',
+      '_build:data',
       '_build:packageJson',
       '_build:readme',
       '_build:babelCache',

diff --git a/tasks/build/installedPlugins.js b/tasks/build/installedPlugins.js
@@ -1,6 +1,5 @@
 module.exports = function (grunt) {
   grunt.registerTask('_build:installedPlugins', function () {
     grunt.file.mkdir('build/kibana/installedPlugins');
-    grunt.file.mkdir('build/kibana/installedPlugins/.data');
   });
 };
diff --git a/tasks/build/osPackages.js b/tasks/build/osPackages.js
@@ -45,7 +45,7 @@ export default (grunt) => {
         '--template-value', `pluginsDir=${config.path.plugins}`,
         '--template-value', `dataDir=${config.path.data}`,
         //uses relative path to --prefix, strip the leading /
-        '--exclude', `${config.path.home.slice(1)}/installedPlugins/.data`
+        '--exclude', `${config.path.home.slice(1)}/data`
       ];
       const debOptions = [
         '-t', 'deb',
@@ -57,7 +57,7 @@ export default (grunt) => {
       ];
       const args = [
         `${buildDir}/=${config.path.home}/`,
-        `${buildDir}/installedPlugins/.data/=${config.path.data}/`,
+        `${buildDir}/data/=${config.path.data}/`,
         `${servicesByName.sysv.outputDir}/etc/=/etc/`,
         `${servicesByName.systemd.outputDir}/etc/=/etc/`
       ];