Merge pull request zowe#20 from 1000TurquoisePogs/bugfix/https-only-d…

…efault Remove http as a default listening server.
sakeerthy · Jan 14, 2019 · 71dd400 · 71dd400
2 parents 2f1408b + 6494e98
commit 71dd400
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/config/zluxserver.json b/config/zluxserver.json
@@ -7,9 +7,6 @@
       "certificates": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.cer"],
       "certificateAuthorities": ["../deploy/product/ZLUX/serverConfig/apiml-localca.cer"]
     },
-    "http": {
-      "port": 8543
-    },
     "mediationLayer": {
       "server": {
         "hostname": "localhost",

diff --git a/js/zluxArgs.js b/js/zluxArgs.js
@@ -71,12 +71,20 @@ const DEFAULT_CONFIG = {
   "pluginsDir":"../deploy/instance/"+PRODUCT_CODE+"/plugins",
 
   "node": {
-    "http": {
-      "port": 8543
+    "https": {
+      "port": 8544,
+      //pfx (string), keys, certificates, certificateAuthorities, and certificateRevocationLists are all valid here.
+      "keys": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.key"],
+      "certificates": ["../deploy/product/ZLUX/serverConfig/zlux.keystore.cer"],
+      "certificateAuthorities": ["../deploy/product/ZLUX/serverConfig/apiml-localca.cer"]
     },
-    "eureka": {
-      "hostname": "localhost",
-      "port": 10011
+    "mediationLayer": {
+      "server": {
+        "hostname": "localhost",
+        "port": 10011,
+        "isHttps": false
+      },
+      "enabled": false
     }
   },
   "dataserviceAuthentication": {
@@ -139,9 +147,10 @@ if (userInput.hostServer) {
   zssHost = userInput.hostServer;
 }
 if (userInput.port) {
+  if (!configJSON.node.http) { configJSON.node.http = {}; }
   configJSON.node.http.port = userInput.port;
 }
-if (userInput.securePort && configJSON.https) {
+if (userInput.securePort && configJSON.node.https) {
   configJSON.node.https.port = userInput.securePort;
 }
 if (userInput.noChild) {