From 8883d488b87cba37409a2b3fbd7e2c98c35af589 Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona <47326048+jloboescalona2@users.noreply.github.com> Date: Thu, 4 Mar 2021 10:41:17 +0100 Subject: [PATCH] F #3951: Add listening host (#912) Co-authored-by: Jorge Lobo --- src/fireedge/fireedge-server.conf | 5 ++++- src/fireedge/src/server/index.js | 8 +++++--- src/fireedge/src/server/utils/constants/defaults.js | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/fireedge/fireedge-server.conf b/src/fireedge/fireedge-server.conf index 9e6e1e5447..212879c704 100644 --- a/src/fireedge/fireedge-server.conf +++ b/src/fireedge/fireedge-server.conf @@ -8,7 +8,10 @@ log: prod # Enable cors (cross-origin resource sharing) cors: true -# Fireedge server port +# Fireedge server host +host: '0.0.0.0' + +# FireEdge server port port: 2616 # OpenNebula: use it if you have oned and fireedge on different servers diff --git a/src/fireedge/src/server/index.js b/src/fireedge/src/server/index.js index 0a6e1f3222..f7c8f38f7b 100644 --- a/src/fireedge/src/server/index.js +++ b/src/fireedge/src/server/index.js @@ -18,6 +18,7 @@ import https from 'https' import { defaultAppName, defaultTypeLog, + defaultHost, defaultPort, defaultWebpackMode, defaultApps @@ -56,6 +57,7 @@ let frontPath = 'client' // settings const appConfig = getConfig() +const host = appConfig.host || defaultHost const port = appConfig.port || defaultPort const userLog = appConfig.log || 'dev' @@ -152,12 +154,12 @@ let config = { message: 'Server no start' } -appServer.listen(port, '0.0.0.0', err => { +appServer.listen(port, host, err => { if (!err) { config = { color: 'green', - type: port, - message: 'Server listen in port %s' + type: `${host}:${port}`, + message: 'Server listen in %s' } } messageTerminal(config) diff --git a/src/fireedge/src/server/utils/constants/defaults.js b/src/fireedge/src/server/utils/constants/defaults.js index 2d3a4b2602..4b089ef6a5 100644 --- a/src/fireedge/src/server/utils/constants/defaults.js +++ b/src/fireedge/src/server/utils/constants/defaults.js @@ -106,6 +106,7 @@ const defaults = { defaultMethodUserInfo: 'user.info', defaultIP: defaultIp, defaultProtocolHotReload: 'http', + defaultHost: '0.0.0.0', defaultPort: 2616, availableLanguages: { bg_BG: 'Bulgarian (Bulgaria)',