Skip to content

Commit

Permalink
minor change to code order so that dynamic config.js has higher prior…
Browse files Browse the repository at this point in the history
…ity over static versions of the file.
  • Loading branch information
John Nye committed Jan 24, 2014
1 parent 66f903c commit 22caeef
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@ require('./lib/cas-auth.js').configureCas(express, app, config);
require('./lib/es-proxy').configureESProxy(app, config.es_host, config.es_port,
config.es_username, config.es_password);

// Serve all kibana3 frontend files
app.use('/', express.static(__dirname + '/kibana/src'));

// Serve config.js for kibana3
// We should use special config.js for the frontend and point the ES to __es/
app.get('/config.js', kibana3configjs);

// Serve all kibana3 frontend files
app.use('/', express.static(__dirname + '/kibana/src'));


run();

function run() {
Expand Down

0 comments on commit 22caeef

Please sign in to comment.