Merge branch 'master' into revert-to-hmac

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-src/public/main.js
+src/public/main.js
+src/.secret

readme.md

@@ -8,6 +8,8 @@ Simple encrypted web chat. Powered by [socket.io](http://socket.io) and the [web
     npm install
     gulp start
 
+Create a **.secret** file in **/src** folder with a your session secret. It doesn't matter what it is- just keep it private.
+
 Darkwire is now running on `http://localhost:3000`
 
 ### Deployment
@@ -42,4 +44,4 @@ Darkwire uses [socket.io](http://socket.io) to transmit encrypted information us
 
 Rooms are stored in memory on the server until all participants have left, at which point the room is destroyed. Only public keys are stored in server memory for the duration of the room's life.
 
-Chat history is stored in each participant's browser, so it is effectively erased (for that user) when their window is closed.
+Chat history is stored in each participant's browser, so it is effectively erased (for that user) when their window is closed.

src/app.js

@@ -9,6 +9,7 @@ import _ from 'underscore';
 import Room from './room';
 import favicon from 'serve-favicon';
 import compression from 'compression';
+import fs from 'fs';
 
 const app = express();
 const server = http.createServer(app);
@@ -20,7 +21,7 @@ const sessionMiddleware = session({
     port: 6379,
     db: 2
   }),
-  secret: 'hay',
+  secret: fs.readFileSync(__dirname + '/.secret', 'UTF-8'),
   resave: true,
   saveUninitialized: true
 });