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

compare with adminFqdn instead of adminLocation

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-10 18:14:29 -08:00
parent 969fba83ea
commit 3067e0940d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/apps.js
View File

@@ -127,7 +127,6 @@ function validateHostname(location, domain, hostname) {
assert.strictEqual(typeof domain, 'string');
const RESERVED_LOCATIONS = [
config.adminLocation(), // FIXME: this shouldn't be here
constants.API_LOCATION,
constants.SMTP_LOCATION,
constants.IMAP_LOCATION,
@@ -135,6 +134,8 @@ function validateHostname(location, domain, hostname) {
];
if (RESERVED_LOCATIONS.indexOf(location) !== -1) return new AppsError(AppsError.BAD_FIELD, location + ' is reserved');
if (hostname === config.adminFqdn()) return new AppsError(AppsError.BAD_FIELD, location + ' is reserved');
// workaround https://github.com/oncletom/tld.js/issues/73
var tmp = hostname.replace('_', '-');
if (!tld.isValid(tmp)) return new AppsError(AppsError.BAD_FIELD, 'Hostname is not a valid domain name');