rename function to setupDashboarDnsAndCert

This commit is contained in:
Girish Ramakrishnan
2020-08-15 22:41:28 -07:00
parent 60a787ce3d
commit d1e14ed691
5 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -278,7 +278,7 @@ function prepareDashboardDomain(domain, auditSource, callback) {
const conflict = result.filter(app => app.fqdn === fqdn);
if (conflict.length) return callback(new BoxError(BoxError.BAD_STATE, 'Dashboard location conflicts with an existing app'));
tasks.add(tasks.TASK_PREPARE_DASHBOARD_DOMAIN, [ domain, auditSource ], function (error, taskId) {
tasks.add(tasks.TASK_SETUP_DASHBOARD_DNS_AND_CERT, [ domain, auditSource ], function (error, taskId) {
if (error) return callback(error);
tasks.startTask(taskId, {}, NOOP_CALLBACK);
@@ -342,7 +342,7 @@ function setupDashboard(auditSource, progressCallback, callback) {
assert.strictEqual(typeof callback, 'function');
async.series([
domains.prepareDashboardDomain.bind(null, settings.adminDomain(), auditSource, progressCallback),
domains.setupDashboardDnsAndCert.bind(null, settings.adminDomain(), auditSource, progressCallback),
setDashboardDomain.bind(null, settings.adminDomain(), auditSource)
], callback);
}
+2 -2
View File
@@ -28,7 +28,7 @@ module.exports = exports = {
checkDnsRecords: checkDnsRecords,
prepareDashboardDomain: prepareDashboardDomain
setupDashboardDnsAndCert: setupDashboardDnsAndCert
};
var assert = require('assert'),
@@ -454,7 +454,7 @@ function makeWildcard(hostname) {
return parts.join('.');
}
function prepareDashboardDomain(domain, auditSource, progressCallback, callback) {
function setupDashboardDnsAndCert(domain, auditSource, progressCallback, callback) {
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof auditSource, 'object');
assert.strictEqual(typeof progressCallback, 'function');
+1 -1
View File
@@ -108,7 +108,7 @@ function setup(dnsConfig, sysinfoConfig, auditSource, callback) {
async.series([
settings.setSysinfoConfig.bind(null, sysinfoConfig),
domains.prepareDashboardDomain.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
domains.setupDashboardDnsAndCert.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
cloudron.setDashboardDomain.bind(null, domain, auditSource),
setProgress.bind(null, 'setup', 'Done'),
eventlog.add.bind(null, eventlog.ACTION_PROVISION, auditSource, { })
+1 -1
View File
@@ -21,7 +21,7 @@ exports = module.exports = {
TASK_BACKUP: 'backup',
TASK_UPDATE: 'update',
TASK_RENEW_CERTS: 'renewcerts',
TASK_PREPARE_DASHBOARD_DOMAIN: 'prepareDashboardDomain',
TASK_SETUP_DASHBOARD_DNS_AND_CERT: 'setupDashboardDnsAndCert',
TASK_CLEAN_BACKUPS: 'cleanBackups',
TASK_SYNC_EXTERNAL_LDAP: 'syncExternalLdap',
+1 -1
View File
@@ -20,7 +20,7 @@ const TASKS = { // indexed by task type
backup: backups.backupBoxAndApps,
update: updater.update,
renewcerts: reverseProxy.renewCerts,
prepareDashboardDomain: domains.prepareDashboardDomain,
setupDashboardDnsAndCert: domains.setupDashboardDnsAndCert,
cleanBackups: backups.cleanup,
syncExternalLdap: externalLdap.sync,