From 9bb13a0d2932a2a810716005ad9230c9d20e761f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 20 May 2014 14:44:50 -0400
Subject: [PATCH] closed #1552

---
 install/databases.js |  3 ++-
 src/install.js       | 22 ++++++----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/install/databases.js b/install/databases.js
index badaecb916..39c6862962 100644
--- a/install/databases.js
+++ b/install/databases.js
@@ -91,13 +91,14 @@ function getSecondaryDatabaseModules(config, next) {
 
 module.exports = function(err, config, databases, callback) {
 	var allowedDBs = Object.keys(databases);
-	
+
 	allowedDBs.forEach(function(db) {
 		questions[db] = require('./../src/database/' + db).questions;
 	});
 
 	async.waterfall([
 		function(next) {
+			process.stdout.write('\n');
 			winston.info('Now configuring ' + config.database + ' database:');
 			success(err, config, next);
 		},
diff --git a/src/install.js b/src/install.js
index 851932d0a4..f8a3182a08 100644
--- a/src/install.js
+++ b/src/install.js
@@ -28,8 +28,8 @@ var install = {},
 questions.main = [
 	{
 		name: 'base_url',
-		description: 'URL of this installation',
-		'default': nconf.get('base_url') || 'http://localhost',
+		description: 'URL used to access this NodeBB',
+		'default': nconf.get('base_url') || 'http://localhost:4567',
 		pattern: /^http(?:s)?:\/\//,
 		message: 'Base URL must begin with \'http://\' or \'https://\'',
 	},
@@ -40,13 +40,6 @@ questions.main = [
 		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?',
-		'default': (nconf.get('use_port') !== undefined ? (nconf.get('use_port') ? 'y' : 'n') : 'y'),
-		pattern: /y[es]*|n[o]?/,
-		message: 'Please enter \'yes\' or \'no\''
-	},
 	{
 		name: 'secret',
 		description: 'Please enter a NodeBB secret',
@@ -195,16 +188,13 @@ function completeConfigSetup(err, config, next) {
 
 	config.bcrypt_rounds = 12;
 	config.upload_path = '/public/uploads';
-	config.use_port = typeof config.use_port === 'boolean' ? config.use_port : config.use_port.slice(0, 1) === 'y';
 
 	var urlObject = url.parse(config.base_url),
-		relative_path = (urlObject.pathname && urlObject.pathname.length > 1) ? urlObject.pathname : '',
-		host = urlObject.host,
-		protocol = urlObject.protocol,
 		server_conf = config;
 
-	server_conf.base_url = protocol + '//' + host;
-	server_conf.relative_path = relative_path;
+	server_conf.base_url = urlObject.protocol + '//' + urlObject.host;
+	server_conf.use_port = urlObject.port !== null ? true : false;
+	server_conf.relative_path = (urlObject.pathname && urlObject.pathname.length > 1) ? urlObject.pathname : '';
 
 	install.save(server_conf, function(err) {
 		if (err) {
@@ -243,7 +233,7 @@ function setupDefaultConfigs(next) {
 	winston.info('Populating database with default configs, if not already set...');
 	var meta = require('./meta'),
 		defaults = require(path.join(__dirname, '../', 'install/data/defaults.json'));
-	
+
 	async.each(defaults, function (configObj, next) {
 		meta.configs.setOnEmpty(configObj.field, configObj.value, next);
 	}, function (err) {