jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

For now auto-register in the setup route

Browse Source 
otherwise, it auto-registers immediately after cloudron-setup
i.e at the image creation time
This commit is contained in:
Girish Ramakrishnan
2019-05-07 17:38:20 -07:00
parent 7596411d70
commit d7cb8842d3
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/provision.js
View File

@@ -112,6 +112,24 @@ function autoprovision(autoconf, callback) {
});
}
function autoRegister(callback) {
assert.strictEqual(typeof callback, 'function');
if (!fs.existsSync(paths.LICENSE_FILE)) return callback();
const license = safe.fs.readFileSync(paths.LICENSE_FILE, 'utf8');
if (!license) return callback(new ProvisionError(ProvisionError.EXTERNAL_ERROR, 'Cannot read license'));
appstore.registerWithLicense(license.trim(), function (error) {
if (error && error.reason !== AppstoreError.ALREADY_REGISTERED) {
debug('Failed to auto-register cloudron', error);
return callback(new ProvisionError(ProvisionError.LICENSE_ERROR, 'Failed to auto-register Cloudron with license. Please contact support@cloudron.io'));
}
callback();
});
}
function unprovision(callback) {
assert.strictEqual(typeof callback, 'function');
@@ -172,7 +190,7 @@ function setup(dnsConfig, autoconf, auditSource, callback) {
callback(); // now that args are validated run the task in the background
async.series([
// setProgress.bind(null, 'setup', 'Registering server'),
autoRegister,
domains.prepareDashboardDomain.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
cloudron.setDashboardDomain.bind(null, domain, auditSource), // this sets up the config.fqdn()
mail.addDomain.bind(null, domain), // this relies on config.mailFqdn()
@@ -322,22 +340,3 @@ function getStatus(callback) {
});
});
}
function autoRegister(callback) {
assert.strictEqual(typeof callback, 'function');
if (!fs.existsSync(paths.LICENSE_FILE)) return callback();
const license = safe.fs.readFileSync(paths.LICENSE_FILE, 'utf8');
if (!license) return callback(new ProvisionError(ProvisionError.EXTERNAL_ERROR, 'Cannot read license'));
appstore.registerWithLicense(license.trim(), function (error) {
if (error && error.reason !== AppstoreError.ALREADY_REGISTERED) {
debug(error);
debug('Failed to auto-register Cloudron with license. Please contact support@cloudron.io');
return; // does not call callback on purpose. the server just 'hangs' with the above error
}
callback();
});
}