This commit is contained in:
Girish Ramakrishnan
2014-09-26 16:06:16 -07:00
parent f2b910a22a
commit d8310bdc1a
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -255,14 +255,14 @@ function getCertificate(callback) {
function provision(args, callback) {
assert(typeof callback === 'function');
if (config.token) return next(new CloudronError(CloudronError.ALREADY_PROVISIONED));
if (config.token) return callback(new CloudronError(CloudronError.ALREADY_PROVISIONED));
config.set(_.pick(args, 'token', 'appServerUrl', 'adminOrigin', 'fqdn', 'aws'));
// override the default webadmin OAuth client record
clientdb.delByAppId('webadmin', function () {
clientdb.add(uuid.v4(), 'webadmin', 'cid-webadmin', 'unused', 'WebAdmin', config.adminOrigin, function (error) {
if (error) return next(new CloudronError(CloudronError.INTERNAL_ERROR, error));
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
callback(null);
+1
View File
@@ -9,6 +9,7 @@ var HttpError = require('../httperror.js'),
df = require('nodejs-disks'),
path = require('path'),
cloudron = require('../cloudron.js'),
CloudronError = cloudron.CloudronError,
config = require('../../config.js'),
exec = require('child_process').exec,
_ = require('underscore'),