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

store subdomain in database instead of fqdn

Browse Source 
this makes it more consistent with the locations table
This commit is contained in:
Girish Ramakrishnan
2023-08-16 19:28:04 +05:30
parent 1133a41b77
commit de7879afb5
9 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/provision.js
View File

@@ -79,7 +79,7 @@ async function setupTask(domain, auditSource) {
await dns.waitForLocations([location], (progress) => setProgress('setup', progress.message));
await reverseProxy.ensureCertificate(location, {}, auditSource);
await ensureDhparams();
await dashboard.setupLocation(domain, auditSource);
await dashboard.setupLocation(constants.DASHBOARD_SUBDOMAIN, domain, auditSource);
setProgress('setup', 'Done'),
await eventlog.add(eventlog.ACTION_PROVISION, auditSource, {});
} catch (error) {
@@ -119,7 +119,7 @@ async function setup(domainConfig, ipv4Config, auditSource) {
dkimSelector: 'cloudron'
};
await mailServer.setLocation(domain, `${constants.DASHBOARD_SUBDOMAIN}.${domain}`); // default mail location. do this before we add the domain for upserting mail DNS
await mailServer.setLocation(constants.DASHBOARD_SUBDOMAIN, domain); // default mail location. do this before we add the domain for upserting mail DNS
await domains.add(domain, data, auditSource);
await network.setIPv4Config(ipv4Config);
@@ -187,7 +187,7 @@ async function restoreTask(backupConfig, remotePath, ipv4Config, options, auditS
await dns.waitForLocations([location], (progress) => setProgress('setup', progress.message));
await reverseProxy.ensureCertificate(location, {}, auditSource);
}
await dashboard.setupLocation(location.domain, auditSource);
await dashboard.setupLocation(constants.DASHBOARD_SUBDOMAIN, location.domain, auditSource);
delete backupConfig.rootPath;
await backups.setConfig(backupConfig);