|
|
|
@ -99,10 +99,18 @@ var async = require('async'),
|
|
|
|
|
next();
|
|
|
|
|
} else {
|
|
|
|
|
winston.error('Required values are missing for automated setup:');
|
|
|
|
|
if (!setupVal['admin:username']) winston.error(' admin:username');
|
|
|
|
|
if (!setupVal['admin:password']) winston.error(' admin:password');
|
|
|
|
|
if (!setupVal['admin:password:confirm']) winston.error(' admin:password:confirm');
|
|
|
|
|
if (!setupVal['admin:email']) winston.error(' admin:email');
|
|
|
|
|
if (!setupVal['admin:username']) {
|
|
|
|
|
winston.error(' admin:username');
|
|
|
|
|
}
|
|
|
|
|
if (!setupVal['admin:password']) {
|
|
|
|
|
winston.error(' admin:password');
|
|
|
|
|
}
|
|
|
|
|
if (!setupVal['admin:password:confirm']) {
|
|
|
|
|
winston.error(' admin:password:confirm');
|
|
|
|
|
}
|
|
|
|
|
if (!setupVal['admin:email']) {
|
|
|
|
|
winston.error(' admin:email');
|
|
|
|
|
}
|
|
|
|
|
process.exit();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
@ -124,9 +132,15 @@ var async = require('async'),
|
|
|
|
|
next();
|
|
|
|
|
} else {
|
|
|
|
|
winston.error('Required values are missing for automated CI integration:');
|
|
|
|
|
if (!ciVals.hasOwnProperty('host')) winston.error(' host');
|
|
|
|
|
if (!ciVals.hasOwnProperty('port')) winston.error(' port');
|
|
|
|
|
if (!ciVals.hasOwnProperty('database')) winston.error(' database');
|
|
|
|
|
if (!ciVals.hasOwnProperty('host')) {
|
|
|
|
|
winston.error(' host');
|
|
|
|
|
}
|
|
|
|
|
if (!ciVals.hasOwnProperty('port')) {
|
|
|
|
|
winston.error(' port');
|
|
|
|
|
}
|
|
|
|
|
if (!ciVals.hasOwnProperty('database')) {
|
|
|
|
|
winston.error(' database');
|
|
|
|
|
}
|
|
|
|
|
process.exit();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
@ -200,10 +214,10 @@ var async = require('async'),
|
|
|
|
|
|
|
|
|
|
// Add CI object
|
|
|
|
|
if (install.ciVals) {
|
|
|
|
|
config['test_database'] = {};
|
|
|
|
|
config.test_database = {};
|
|
|
|
|
for(var prop in install.ciVals) {
|
|
|
|
|
if (install.ciVals.hasOwnProperty(prop)) {
|
|
|
|
|
config['test_database'][prop] = install.ciVals[prop];
|
|
|
|
|
config.test_database[prop] = install.ciVals[prop];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|