Repository: incubator-ignite Updated Branches: refs/heads/ignite-1121 1adbcfc60 -> 95fb321f6
# IGNITE-1121 Allow to run agent server without SSL. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/95fb321f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/95fb321f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/95fb321f Branch: refs/heads/ignite-1121 Commit: 95fb321f6131de3cdcf590a59e720ab7ac65c8dc Parents: 1adbcfc Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Wed Jul 22 16:38:39 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Wed Jul 22 16:38:39 2015 +0300 ---------------------------------------------------------------------- modules/web-control-center/nodejs/bin/www | 17 ++++++++++++----- .../web-control-center/nodejs/config/default.json | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/95fb321f/modules/web-control-center/nodejs/bin/www ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/bin/www b/modules/web-control-center/nodejs/bin/www index eb1e373..cbc637a 100644 --- a/modules/web-control-center/nodejs/bin/www +++ b/modules/web-control-center/nodejs/bin/www @@ -34,11 +34,18 @@ server.on('listening', onListening); /** * Start agent server. */ -var agentServer = https.createServer({ - key: fs.readFileSync(config.get('monitor:server:key')), - cert: fs.readFileSync(config.get('monitor:server:cert')), - passphrase: config.get('monitor:server:keyPassphrase') -}); +var agentServer; + +if (config.get('monitor:server:ssl')) { + agentServer = https.createServer({ + key: fs.readFileSync(config.get('monitor:server:key')), + cert: fs.readFileSync(config.get('monitor:server:cert')), + passphrase: config.get('monitor:server:keyPassphrase') + }); +} +else { + agentServer = http.createServer(); +} agentServer.listen(config.get('monitor:server:port')); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/95fb321f/modules/web-control-center/nodejs/config/default.json ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/config/default.json b/modules/web-control-center/nodejs/config/default.json index 28b2b64..f7f7a02 100644 --- a/modules/web-control-center/nodejs/config/default.json +++ b/modules/web-control-center/nodejs/config/default.json @@ -8,9 +8,10 @@ "monitor": { "server": { "port": 3001, + "ssl": true, "key": "keys/test.key", "cert": "keys/test.crt", "keyPassphrase": "password" } } -} \ No newline at end of file +}
