iamthefij
/
cloudron-e2e-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ensure the webadmin domain is correctly figured

This commit is contained in:
Johannes Zellner 2016-06-29 14:59:09 +02:00
parent 49ea131234
commit a767f28dd8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudron.js
View File

@ -23,7 +23,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
function Cloudron(box) {
this._box = box;
this._isCustomDomain = box.domain === process.env.CUSTOM_DOMAIN;
this._isCustomDomain = box.domain === process.env.CUSTOM_DOMAIN || box.domain === process.env.SELFHOST_DOMAIN;
this._adminFqdn = this._isCustomDomain ? 'my.' + box.domain : 'my-' + box.domain;
this._origin = this._isCustomDomain ? 'https://my.' + box.domain : 'https://my-' + box.domain;
@ -652,7 +652,7 @@ Cloudron.prototype.checkMail = function (account, callback) {
user: account.username,
password: account.password,
host: this._adminFqdn,
port: 993, // imap port
port: 993, // imap port
tls: true,
tlsOptions: { rejectUnauthorized: false },
readOnly: true