Merge pull request #1149 from ikwhan-chang/master

Add CA and Passphrase for custom HTTPS

Author: shakyShane

lib/server/utils.js

@@ -22,7 +22,9 @@ var utils = {
     getKeyAndCert: function (options) {
         return {
             key:  fs.readFileSync(options.getIn(["https", "key"])  || filePath.join(__dirname, "certs/server.key")),
-            cert: fs.readFileSync(options.getIn(["https", "cert"]) || filePath.join(__dirname, "certs/server.crt"))
+            cert: fs.readFileSync(options.getIn(["https", "cert"]) || filePath.join(__dirname, "certs/server.crt")),
+            ca: fs.readFileSync(options.getIn(["https", "ca"]) || filePath.join(__dirname, "certs/server.csr")),
+            passphrase: options.getIn(["https", "passphrase"]) || ''
         };
     },
     /**