Skip to content

Commit

Permalink
[folder structure] plugins/.data -> data
Browse files Browse the repository at this point in the history
  • Loading branch information
jbudz committed Jul 5, 2016
1 parent 28f30f8 commit a30cae3
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target
.htpasswd
.eslintcache
plugins
data
disabledPlugins
webpackstats.json
config/kibana.dev.yml
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/server/path/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const CONFIG_PATHS = [

const DATA_PATHS = [
process.env.DATA_PATH,
fromRoot('plugins/.data'),
fromRoot('data'),
'/var/lib/kibana'
].filter(Boolean);

Expand Down
5 changes: 5 additions & 0 deletions tasks/build/data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export default function (grunt) {
grunt.registerTask('_build:data', function () {
grunt.file.mkdir('build/kibana/data');
});
};
1 change: 1 addition & 0 deletions tasks/build/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = function (grunt) {
'babel:build',
'_build:babelOptions',
'_build:plugins',
'_build:data',
'_build:packageJson',
'_build:readme',
'_build:babelCache',
Expand Down
1 change: 0 additions & 1 deletion tasks/build/installed_plugins.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = function (grunt) {
grunt.registerTask('_build:plugins', function () {
grunt.file.mkdir('build/kibana/plugins');
grunt.file.mkdir('build/kibana/plugins/.data');
});
};
4 changes: 2 additions & 2 deletions tasks/build/os_packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default (grunt) => {
//config folder is moved to path.conf, exclude {path.home}/config
//uses relative path to --prefix, strip the leading /
'--exclude', `${packages.path.home.slice(1)}/config`,
'--exclude', `${packages.path.home.slice(1)}/plugins/.data`
'--exclude', `${packages.path.home.slice(1)}/data`
];
const debOptions = [
'-t', 'deb',
Expand All @@ -60,7 +60,7 @@ export default (grunt) => {
const args = [
`${buildDir}/=${packages.path.home}/`,
`${buildDir}/config/=${packages.path.conf}/`,
`${buildDir}/plugins/.data/=${packages.path.data}/`,
`${buildDir}/data/=${packages.path.data}/`,
`${servicesByName.sysv.outputDir}/etc/=/etc/`,
`${servicesByName.systemd.outputDir}/lib/=/lib/`
];
Expand Down

0 comments on commit a30cae3

Please sign in to comment.