[folder structure] plugins/.data -> data

This commit is contained in:
Jonathan Budzenski 2016-06-28 10:21:31 -05:00
parent 28f30f8b73
commit a30cae3316
7 changed files with 10 additions and 4 deletions

1
.gitignore vendored
View file

@ -20,6 +20,7 @@ target
.htpasswd .htpasswd
.eslintcache .eslintcache
plugins plugins
data
disabledPlugins disabledPlugins
webpackstats.json webpackstats.json
config/kibana.dev.yml config/kibana.dev.yml

View file

@ -10,7 +10,7 @@ const CONFIG_PATHS = [
const DATA_PATHS = [ const DATA_PATHS = [
process.env.DATA_PATH, process.env.DATA_PATH,
fromRoot('plugins/.data'), fromRoot('data'),
'/var/lib/kibana' '/var/lib/kibana'
].filter(Boolean); ].filter(Boolean);

5
tasks/build/data.js Normal file
View file

@ -0,0 +1,5 @@
export default function (grunt) {
grunt.registerTask('_build:data', function () {
grunt.file.mkdir('build/kibana/data');
});
};

View file

@ -10,6 +10,7 @@ module.exports = function (grunt) {
'babel:build', 'babel:build',
'_build:babelOptions', '_build:babelOptions',
'_build:plugins', '_build:plugins',
'_build:data',
'_build:packageJson', '_build:packageJson',
'_build:readme', '_build:readme',
'_build:babelCache', '_build:babelCache',

View file

@ -1,6 +1,5 @@
module.exports = function (grunt) { module.exports = function (grunt) {
grunt.registerTask('_build:plugins', function () { grunt.registerTask('_build:plugins', function () {
grunt.file.mkdir('build/kibana/plugins'); grunt.file.mkdir('build/kibana/plugins');
grunt.file.mkdir('build/kibana/plugins/.data');
}); });
}; };

View file

@ -45,7 +45,7 @@ export default (grunt) => {
//config folder is moved to path.conf, exclude {path.home}/config //config folder is moved to path.conf, exclude {path.home}/config
//uses relative path to --prefix, strip the leading / //uses relative path to --prefix, strip the leading /
'--exclude', `${packages.path.home.slice(1)}/config`, '--exclude', `${packages.path.home.slice(1)}/config`,
'--exclude', `${packages.path.home.slice(1)}/plugins/.data` '--exclude', `${packages.path.home.slice(1)}/data`
]; ];
const debOptions = [ const debOptions = [
'-t', 'deb', '-t', 'deb',
@ -60,7 +60,7 @@ export default (grunt) => {
const args = [ const args = [
`${buildDir}/=${packages.path.home}/`, `${buildDir}/=${packages.path.home}/`,
`${buildDir}/config/=${packages.path.conf}/`, `${buildDir}/config/=${packages.path.conf}/`,
`${buildDir}/plugins/.data/=${packages.path.data}/`, `${buildDir}/data/=${packages.path.data}/`,
`${servicesByName.sysv.outputDir}/etc/=/etc/`, `${servicesByName.sysv.outputDir}/etc/=/etc/`,
`${servicesByName.systemd.outputDir}/lib/=/lib/` `${servicesByName.systemd.outputDir}/lib/=/lib/`
]; ];