IGNITE-3262 Moved test settings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/695096af Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/695096af Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/695096af Branch: refs/heads/ignite-3262 Commit: 695096affa7dd11ea68a5916b653d43545562659 Parents: 8575ece Author: Maxim Afanasiev <[email protected]> Authored: Mon Jun 27 15:04:59 2016 +0700 Committer: Maxim Afanasiev <[email protected]> Committed: Mon Jun 27 15:04:59 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/serve/config/settings.test.json | 19 ------------------- .../web-console/src/main/js/serve/settings.js | 7 ++----- .../main/js/test/backend/config/settings.json | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/695096af/modules/web-console/src/main/js/serve/config/settings.test.json ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/serve/config/settings.test.json b/modules/web-console/src/main/js/serve/config/settings.test.json deleted file mode 100644 index c93b96d..0000000 --- a/modules/web-console/src/main/js/serve/config/settings.test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "server": { - "port": 3000, - "static": "./build" - }, - "mongoDB": { - "url": "mongodb://localhost/console-test" - }, - "agent-server": { - "port": 3001 - }, - "smtp": { - "service": "localhost", - "username": "Apache Ignite Web Console", - "sign": "Kind regards,<br>Apache Ignite Team", - "email": "[email protected]", - "password": "test" - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/695096af/modules/web-console/src/main/js/serve/settings.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/serve/settings.js b/modules/web-console/src/main/js/serve/settings.js index faf6425..8973e5d 100644 --- a/modules/web-console/src/main/js/serve/settings.js +++ b/modules/web-console/src/main/js/serve/settings.js @@ -30,11 +30,8 @@ module.exports = { module.exports.factory = function(nconf, fs) { nconf.file({file: './serve/config/settings.json'}); - if(process.env.NODE_ENV) { - const envConfigFile = `./serve/config/settings.${process.env.NODE_ENV}.json`; - - fs.existsSync(envConfigFile) && nconf.file({file: envConfigFile}); - } + if(process.env.CONFIG_PATH && fs.existsSync(process.env.CONFIG_PATH)) + nconf.file({file: process.env.CONFIG_PATH}); /** * Normalize a port into a number, string, or false. http://git-wip-us.apache.org/repos/asf/ignite/blob/695096af/modules/web-console/src/main/js/test/backend/config/settings.json ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/test/backend/config/settings.json b/modules/web-console/src/main/js/test/backend/config/settings.json new file mode 100644 index 0000000..c93b96d --- /dev/null +++ b/modules/web-console/src/main/js/test/backend/config/settings.json @@ -0,0 +1,19 @@ +{ + "server": { + "port": 3000, + "static": "./build" + }, + "mongoDB": { + "url": "mongodb://localhost/console-test" + }, + "agent-server": { + "port": 3001 + }, + "smtp": { + "service": "localhost", + "username": "Apache Ignite Web Console", + "sign": "Kind regards,<br>Apache Ignite Team", + "email": "[email protected]", + "password": "test" + } +}
