Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 06:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1243

Browse Source
This commit is contained in:
barisusakli
2014-03-18 18:15:07 -04:00
parent d2af4a6b69
commit 7d382b2900
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/install.js
View File

@@ -1,3 +1,5 @@
'use strict';
var async = require('async'), var async = require('async'),
utils = require('../public/src/utils.js'), utils = require('../public/src/utils.js'),
fs = require('fs'), fs = require('fs'),
@@ -150,15 +152,15 @@ var async = require('async'),
relative_path = (urlObject.pathname && urlObject.pathname.length > 1) ? urlObject.pathname : '', relative_path = (urlObject.pathname && urlObject.pathname.length > 1) ? urlObject.pathname : '',
host = urlObject.host, host = urlObject.host,
protocol = urlObject.protocol, protocol = urlObject.protocol,
server_conf = config, server_conf = config;
client_conf = {
relative_path: relative_path
};
server_conf.base_url = protocol + '//' + host; server_conf.base_url = protocol + '//' + host;
server_conf.relative_path = relative_path; server_conf.relative_path = relative_path;
install.save(server_conf, client_conf, function(err) { install.save(server_conf, function(err) {
if (err) {
return next(err);
}
require('./database').init(next); require('./database').init(next);
}); });
}; };
@@ -362,7 +364,7 @@ var async = require('async'),
} }
], function (err) { ], function (err) {
if (err) { if (err) {
winston.warn('NodeBB Setup Aborted.'); winston.warn('NodeBB Setup Aborted. ' + err.message);
process.exit(); process.exit();
} else { } else {
callback(); callback();
@@ -403,10 +405,8 @@ var async = require('async'),
return callback(new Error('aborted')); return callback(new Error('aborted'));
} }
// Check if the passwords match
if (results['password:confirm'] !== results.password) { if (results['password:confirm'] !== results.password) {
winston.warn("Passwords did not match, please try again"); winston.warn("Passwords did not match, please try again");
// Re-prompt password questions.
return retryPassword(results); return retryPassword(results);
} }
@@ -452,32 +452,25 @@ var async = require('async'),
success(null, results); success(null, results);
} }
}, },
save: function (server_conf, client_conf, callback) { save: function (server_conf, callback) {
var serverConfigPath = path.join(__dirname, '../config.json'); var serverConfigPath = path.join(__dirname, '../config.json');
if (nconf.get('config')) { if (nconf.get('config')) {
serverConfigPath = path.join(__dirname, '../', nconf.get('config')); serverConfigPath = path.join(__dirname, '../', nconf.get('config'));
} }
// Server Config
async.parallel([
function (next) {
fs.writeFile(serverConfigPath, JSON.stringify(server_conf, null, 4), function (err) { fs.writeFile(serverConfigPath, JSON.stringify(server_conf, null, 4), function (err) {
next(err); if (err) {
}); winston.error('Error saving server configuration! ' + err.message);
}, return callback(err);
function (next) {
fs.writeFile(path.join(__dirname, '../', 'public', 'config.json'), JSON.stringify(client_conf, null, 4), function (err) {
next(err);
});
} }
], function (err) {
winston.info('Configuration Saved OK'); winston.info('Configuration Saved OK');
nconf.file({ nconf.file({
file: path.join(__dirname, '..', 'config.json') file: path.join(__dirname, '..', 'config.json')
}); });
callback(err); callback();
}); });
} }
}; };