Merge branch 'master' of https://github.com/designcreateplay/NodeBB

README.md

@@ -16,7 +16,11 @@ Please support NodeBB development! Check out our IndieGoGo campaign and like, sh
 
 ## Requirements
 
-NodeBB requires a version of Node.js at least 0.8 or greater, and a Redis version 2.6 or greater.
+NodeBB requires the following software to be installed:
+
+* A version of Node.js at least 0.8 or greater
+* Redis, version 2.6 or greater.
+* nginx, version 1.3.13 or greater
 
 ## Installation
 

public/src/app.js

@@ -15,7 +15,7 @@ var socket,
 				API_URL = data.api_url;
 
 				config = data;
-				socket = io.connect(config.socket.address + (config.socket.port ? ':' + config.socket.port : ''));
+				socket = io.connect(config.socket.address);
 
 				var reconnecting = false;
 				var reconnectTries = 0;

src/install.js

@@ -75,8 +75,7 @@ var	async = require('async'),
 					server_conf = config,
 					client_conf = {
 						socket: {
-							address: protocol + '//' + host,
-							port: config.port
+							address: protocol + '//' + host + (config.use_port ? ':' + config.port : '')
 						},
 						api_url: protocol + '//' + host + (config.use_port ? ':' + config.port : '') + relative_path + '/api/',
 						relative_path: relative_path