From 73d4152d1d31389cd089d72f34beea40566f4500 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Aug 2013 11:07:44 -0400 Subject: [PATCH 1/2] updated readme to add nginx version requirement --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ddc2cccc8..a957c41380 100644 --- a/README.md +++ b/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 From 8a53c56a46620105e904e6cbaca43cd391fdd963 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Aug 2013 11:18:15 -0400 Subject: [PATCH 2/2] updated install script to only populate "socket" object in client config with "address", which takes "use_port" into account. This closes #234 --- public/src/app.js | 2 +- src/install.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 11341a9c78..837764db53 100644 --- a/public/src/app.js +++ b/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; diff --git a/src/install.js b/src/install.js index 6431b0a689..22275068bc 100644 --- a/src/install.js +++ b/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