Merge branch 'master' into dev

Author: ostracod

README.md

@@ -38,13 +38,14 @@ The directory `ostracodMultiplayerConfig` should contain these files:
 
 * `ostracodMultiplayerConfig/ssl.crt`
 * `ostracodMultiplayerConfig/ssl.key`
+* `ostracodMultiplayerConfig/ssl.ca-bundle` (Optional)
 * `ostracodMultiplayerConfig/serverConfig.json`
 * `ostracodMultiplayerConfig/gameConfig.json`
 * `ostracodMultiplayerConfig/databaseConfig.json`
 * `ostracodMultiplayerConfig/schemaConfig.json`
 * `ostracodMultiplayerConfig/favicon.ico` (Optional)
 
-`ssl.crt` and `ssl.key` are the files required to enable https.
+`ssl.crt` and `ssl.key` are the files required to enable https. `ssl.ca-bundle` may also be necessary depending on your certificate provider.
 
 Format of `serverConfig.json`:
 

ostracodMultiplayer.js

@@ -99,6 +99,10 @@ OstracodMultiplayer.prototype.initializeServer = function(basePath, gameDelegate
         var privateKey  = fs.readFileSync(pathUtils.join(this.configDirectory, "ssl.key"), "utf8");
         var certificate = fs.readFileSync(pathUtils.join(this.configDirectory, "ssl.crt"), "utf8");
         var credentials = {key: privateKey, cert: certificate};
+        var tempPath = pathUtils.join(this.configDirectory, "ssl.ca-bundle");
+        if (fs.existsSync(tempPath)) {
+            credentials.ca = fs.readFileSync(tempPath);
+        }
         server = https.createServer(credentials, this.expressApp);
     }
     expressWs(this.expressApp, server);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ostracod-multiplayer",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "index.js",
   "dependencies": {
     "bcrypt": "^3.0.8",