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

settings: move mailFqdn/Domain into mailServer

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-04 21:37:38 +05:30
parent 946e5caacb
commit 4cdf37b060
15 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/common.js
View File

@@ -8,6 +8,7 @@ const apps = require('../apps.js'),
expect = require('expect.js'),
fs = require('fs'),
mailer = require('../mailer.js'),
mailServer = require('../mailserver.js'),
nock = require('nock'),
path = require('path'),
paths = require('../paths.js'),
@@ -221,7 +222,7 @@ async function domainSetup() {
nock.cleanAll();
await databaseSetup();
await settings.setMailLocation(domain.domain, `${constants.DASHBOARD_SUBDOMAIN}.${domain.domain}`); // default mail location. do this before we add the domain for upserting mail DNS
await mailServer.initLocation(domain.domain, `${constants.DASHBOARD_SUBDOMAIN}.${domain.domain}`); // default mail location. do this before we add the domain for upserting mail DNS
await domains.add(domain.domain, domain, auditSource);
}