github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

support uncommitted kibana.yml additions next to the kibana.yml file

Browse source
This commit is contained in:
spalger 2015-08-11 10:39:55 -07:00
parent c31109ec61
commit 8c546bf106
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,3 +13,4 @@ esvm
.htpasswd
installedPlugins
webpackstats.json
config/kibana.dev.yml

4
src/cli/serve/serve.js
View file

@ -62,6 +62,10 @@ module.exports = function (program) {
let KbnServer = src('server/KbnServer');
let settings = readYamlConfig(opts.config || fromRoot('config/kibana.yml'));
try { _.merge(settings, readYamlConfig(fromRoot('config/kibana.dev.yml'))); }
catch (e) { null; }
let set = _.partial(_.set, settings);
let get = _.partial(_.get, settings);