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

start recvmail addon in setup_infra

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-05-11 08:45:52 -07:00
parent 8be3b4c281
commit 646ba096c3
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cloudron.js
View File

@@ -63,8 +63,6 @@ var REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh'),
var NOOP_CALLBACK = function (error) { if (error) debug(error); };
var ENABLE_INCOMING_MAIL = true; // TODO: make settings
var gUpdatingDns = false, // flag for dns update reentrancy
gCloudronDetails = null, // cached cloudron details like region,size...
gAppstoreUserDetails = {},
@@ -458,7 +456,7 @@ function addDnsRecords() {
if (config.isCustomDomain()) {
records.push(webadminRecord);
records.push(dkimRecord);
if (ENABLE_INCOMING_MAIL) records.push(mxRecord);
if (settings.isIncomingMailEnabled()) records.push(mxRecord);
} else {
// for custom domains, we show a nakeddomain.html page
var nakedDomainRecord = { subdomain: '', type: 'A', values: [ ip ] };
@@ -467,7 +465,7 @@ function addDnsRecords() {
records.push(webadminRecord);
records.push(dkimRecord);
records.push(dmarcRecord);
if (ENABLE_INCOMING_MAIL) records.push(mxRecord);
if (settings.isIncomingMailEnabled()) records.push(mxRecord);
}
debug('addDnsRecords: %j', records);