Add CA bundle

3 files changed, 7 insertions, 4 deletions

diff --git a/breadQuest.js b/breadQuest.js
index b17e08c..aab1156 100644
--- a/breadQuest.js
+++ b/breadQuest.js
@@ -38,7 +38,8 @@ if (mode == "development") {
 } else {
     var privateKey  = fs.readFileSync("ssl.key", "utf8");
     var certificate = fs.readFileSync("ssl.crt", "utf8");
-    var credentials = {key: privateKey, cert: certificate};
+    var caBundle = fs.readFileSync("ssl.ca-bundle", "utf8");
+    var credentials = {key: privateKey, cert: certificate, ca: caBundle};
     server = https.createServer(credentials, app);
 }
 expressWs(app, server);
diff --git a/package.json b/package.json
index 66b7bc4..1230445 100644
--- a/package.json
+++ b/package.json
@@ -6,13 +6,13 @@
     "start": "node breadQuest.js"
   },
   "dependencies": {
-    "bcrypt": "^1.0.3",
+    "bcrypt": "^2.0.1",
     "body-parser": "~1.17.1",
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.3",
-    "express": "~4.15.2",
+    "express": "^4.15.5",
     "express-session": "^1.15.2",
-    "express-ws": "^3.0.0",
+    "express-ws": "^4.0.0",
     "jade": "~1.11.0",
     "morgan": "~1.8.1",
     "mustache-express": "^1.2.4",
diff --git a/restart.sh b/restart.sh
index 076a68c..b843386 100755
--- a/restart.sh
+++ b/restart.sh
@@ -1,5 +1,7 @@
+#!/bin/sh
 
 echo "Restarting..."
 
 pkill -f "node breadQuest.js"
+sleep 1
 NODE_ENV="production" nohup node breadQuest.js > serverMessages.txt 2>&1 &