diff --git a/src/cloudron.js b/src/cloudron.js index 075dce61e..37e04dad2 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -328,13 +328,13 @@ async function setupDnsAndCert(subdomain, domain, auditSource, progressCallback) const ipv6Enabled = await settings.getIPv6Config(); const ipv6 = ipv6Enabled ? await sysinfo.getServerIPv6() : null; - progressCallback({ message: `Updating DNS of ${dashboardFqdn}` }); + progressCallback({ percent: 20, message: `Updating DNS of ${dashboardFqdn}` }); await dns.upsertDnsRecords(subdomain, domain, 'A', [ ipv4 ]); if (ipv6Enabled) await dns.upsertDnsRecords(subdomain, domain, 'AAAA', [ ipv6 ]); - progressCallback({ message: `Waiting for DNS of ${dashboardFqdn}` }); + progressCallback({ percent: 40, message: `Waiting for DNS of ${dashboardFqdn}` }); await dns.waitForDnsRecord(subdomain, domain, 'A', ipv4, { interval: 30000, times: 50000 }); if (ipv6Enabled) await dns.waitForDnsRecord(subdomain, domain, 'AAAA', ipv6, { interval: 30000, times: 50000 }); - progressCallback({ message: `Getting certificate of ${dashboardFqdn}` }); + progressCallback({ percent: 60, message: `Getting certificate of ${dashboardFqdn}` }); await reverseProxy.ensureCertificate(dns.fqdn(subdomain, domainObject), domain, auditSource); } diff --git a/src/mail.js b/src/mail.js index b5f25c274..c49ac1723 100644 --- a/src/mail.js +++ b/src/mail.js @@ -934,7 +934,7 @@ async function changeLocation(auditSource, progressCallback) { let progress = 20; progressCallback({ percent: progress, message: `Setting up DNS of certs of mail server ${fqdn}` }); - await cloudron.setupDnsAndCert(subdomain, domain, auditSource, progressCallback); + await cloudron.setupDnsAndCert(subdomain, domain, auditSource, (progress) => progressCallback({ message: progress.message })); // remove the percent const allDomains = await domains.list(); for (let idx = 0; idx < allDomains.length; idx++) {