Merge branch 'master' of https://github.com/psychobunny/node-forum

.gitignore

@@ -5,3 +5,4 @@
 npm-debug.log
 node_modules/
 sftp-config.json
+public/config.json

public/config.default.json

@@ -0,0 +1,6 @@
+{
+	"socket" : {
+		"address" : "localhost",
+		"port" : "4567"
+	}
+}

public/config.json

@@ -1,6 +0,0 @@
-{
-	"socket" : {
-		"address" : "198.199.80.41",
-		"port" : "8081"
-	}
-}

src/webserver.js

@@ -1,7 +1,8 @@
 var express = require('express'),
+	WebServer = express(),
+	server = require('http').createServer(WebServer),
     connect = require('connect'),
-    config = require('../config.js'),
+    config = require('../config.js');
-    WebServer = express();
 
 (function(app) {
 	var templates = global.templates;
@@ -38,8 +39,9 @@ var express = require('express'),
 			app.use(express.static(global.configuration.ROOT_DIRECTORY + '/public')); 
 			app.set('mailOptions', config.mailer);
 		});
-		
-		app.listen(config.port);
 	}
 
 }(WebServer));
+
+server.listen(config.port);
+global.server = server;

src/websockets.js

@@ -1,5 +1,5 @@
 
-var SocketIO = require('socket.io').listen(8081);
+var SocketIO = require('socket.io').listen(global.server);
 
 
 (function(io) {