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

mail: use dashboardDomain and not mailDomain

Browse Source 
also remove unused mail_domain
This commit is contained in:
Girish Ramakrishnan
2021-11-25 13:34:22 -08:00
parent e5301fead5
commit 3dcbeb11b8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mail.js
+6 -7
View File
@@ -610,11 +610,10 @@ async function checkConfiguration() {
return markdownMessage; // empty message means all status checks succeeded
}
async function createMailConfig(mailFqdn, mailDomain) {
async function createMailConfig(mailFqdn) {
assert.strictEqual(typeof mailFqdn, 'string');
assert.strictEqual(typeof mailDomain, 'string');
debug('createMailConfig: generating mail config');
debug(`createMailConfig: generating mail config with ${mailFqdn}`);
const mailDomains = await listDomains();
@@ -623,7 +622,7 @@ async function createMailConfig(mailFqdn, mailDomain) {
// mail_domain is used for SRS
if (!safe.fs.writeFileSync(`${paths.MAIL_CONFIG_DIR}/mail.ini`,
`mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_server_name=${mailFqdn}\nmail_domain=${mailDomain}\n\n`, 'utf8')) {
`mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_server_name=${mailFqdn}\n\n`, 'utf8')) {
throw new BoxError(BoxError.FS_ERROR, `Could not create mail var file: ${safe.error.message}`);
}
@@ -706,7 +705,7 @@ async function configureMail(mailFqdn, mailDomain, serviceConfig) {
await shell.promises.exec('stopMail', 'docker stop mail || true');
await shell.promises.exec('removeMail', 'docker rm -f mail || true');
const allowInbound = await createMailConfig(mailFqdn, mailDomain);
const allowInbound = await createMailConfig(mailFqdn);
const ports = allowInbound ? '-p 587:2587 -p 993:9993 -p 4190:4190 -p 25:2587 -p 465:2465 -p 995:9995' : '';
const readOnly = !serviceConfig.recoveryMode ? '--read-only' : '';
@@ -762,8 +761,8 @@ async function restartMail() {
const servicesConfig = await settings.getServicesConfig();
const mailConfig = servicesConfig['mail'] || {};
debug(`restartMail: restarting mail container with mailFqdn:${settings.mailFqdn()} dashboardDomain:${settings.dashboardDomain()}`);
await configureMail(settings.mailFqdn(), settings.dashboardDomain(), mailConfig);
debug(`restartMail: restarting mail container with mailFqdn:${settings.mailFqdn()} mailDomain:${settings.mailDomain()}`);
await configureMail(settings.mailFqdn(), settings.mailDomain(), mailConfig);
}
async function startMail(existingInfra) {