Merge pull request zowe#30 from 1000TurquoisePogs/feature/allow-speci…

…fication-of-addresses Adding ipAddresses field for zlux and agent(zss) for specifying binding to specific IPs
sakeerthy · Jan 14, 2019 · cd0ec64 · cd0ec64
2 parents 71dd400 + c30e226
commit cd0ec64
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/config/zluxserver.json b/config/zluxserver.json
@@ -1,6 +1,7 @@
 {
   "node": {
     "https": {
+      "ipAddresses": ["0.0.0.0"],
       "port": 8544,
       //pfx (string), keys, certificates, certificateAuthorities, and certificateRevocationLists are all valid here.
       "keys": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.key"],
@@ -22,6 +23,15 @@
       }
     ]
   },
+  "agent": {
+    //host is for zlux to know, not zss
+    "host": "localhost",
+    "http": {
+      "ipAddresses": ["0.0.0.0"],
+      //to be a replacement for zssPort
+      "port": 8542
+    }
+  },
 // All paths relative to ZLUX/node or ZLUX/bin
 // In real installations, these values will be configured during the install.
   "rootDir":"../deploy",

diff --git a/js/zluxArgs.js b/js/zluxArgs.js
@@ -72,6 +72,7 @@ const DEFAULT_CONFIG = {
 
   "node": {
     "https": {
+      "ipAddresses": ["0.0.0.0"],
       "port": 8544,
       //pfx (string), keys, certificates, certificateAuthorities, and certificateRevocationLists are all valid here.
       "keys": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.key"],
@@ -95,7 +96,15 @@ const DEFAULT_CONFIG = {
       }
     }
   },
-  "zssPort":8542
+  "agent": {
+    //host is for zlux to know, not zss
+    "host": "localhost",
+    "http": {
+      "ipAddresses": ["0.0.0.0"],
+      //to be a replacement for zssPort
+      "port": 8542
+    }
+  }  
 };
 
 const MVD_ARGS = [
@@ -141,7 +150,17 @@ if(eUser && ePass){
   configJSON.node.mediationLayer.eureka.serviceUrls.default = [`http://${eUser}:${ePass}@${configJSON.node.mediationLayer.server.hostname}:${configJSON.node.mediationLayer.server.port}/eureka/apps/`];
 }
 if (!hostPort) {
-  hostPort = configJSON.zssPort;
+  if (configJSON.agent) {
+    if (configJSON.agent.https) {
+      hostPort = configJSON.agent.https.port;
+    } else if (configJSON.agent.http) {
+      hostPort = configJSON.agent.http.port;
+    } else {
+      console.warn(`Invalid server configuration. Agent specified without http or https port`);
+    }
+  } else if (configJSON.zssPort) {
+    hostPort = configJSON.zssPort;
+  }
 }
 if (userInput.hostServer) {
   zssHost = userInput.hostServer;