Merge branch 'master' of https://github.com/iamcardinal/NodeBB-enhancement into iamcardinal-merge

v1.18.x
Julian Lam 12 years ago
commit 839649d42f

@ -18,7 +18,9 @@ var async = require('async'),
}, {
name: 'port',
description: 'Port number of your NodeBB',
'default': 4567
'default': 4567,
pattern: /[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]/,
message: 'Please enter a value betweeen 1 and 65535'
}, {
name: 'use_port',
description: 'Use a port number to access NodeBB?',
@ -40,7 +42,11 @@ var async = require('async'),
}, {
name: 'redis:password',
description: 'Password of your Redis database'
}],
}, {
name: 'bind_address',
description: 'IP or Hostname to bind to',
'default': '0.0.0.0'
}],
setup: function (callback) {
async.series([
function (next) {

@ -162,7 +162,33 @@ var utils = require('./../public/src/utils.js'),
'src/ajaxify.js',
'src/translator.js',
'src/jquery.form.js',
'src/utils.js'
'src/utils.js',
'src/forum/account.js',
'src/forum/accountedit.js',
'src/forum/accountheader.js',
'src/forum/accountsettings.js',
'src/forum/category.js',
'src/forum/favourites.js',
'src/forum/followers.js',
'src/forum/following.js',
'src/forum/footer.js',
'src/forum/login.js',
'src/forum/recent.js',
'src/forum/register.js',
'src/forum/reset.js',
'src/forum/reset_code.js',
'src/forum/search.js',
'src/forum/topic.js',
'src/forum/unread.js',
'src/forum/users.js',
'src/forum/admin/categories.js',
'src/forum/admin/footer.js',
'src/forum/admin/groups.js',
'src/forum/admin/index.js',
'src/forum/admin/plugins.js',
'src/forum/admin/themes.js',
'src/forum/admin/topics.js',
'src/forum/admin/users'
],
minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'),
get: function (callback) {

@ -185,7 +185,7 @@ var express = require('express'),
templates['logout'] = parsedTemplate;
});
server.listen(nconf.get('PORT') || nconf.get('port'));
server.listen(nconf.get('PORT') || nconf.get('port'), nconf.get('bind_address'));
}
app.create_route = function (url, tpl) { // to remove

Loading…
Cancel
Save