allow hyphenated subdomains on all editions

This commit is contained in:
Girish Ramakrishnan
2018-10-30 20:30:09 -07:00
parent 0ba0b009c7
commit ce93518c0a
2 changed files with 0 additions and 10 deletions

View File

@@ -40,7 +40,6 @@ exports = module.exports = {
// feature flags based on editions (these have a separate license from standard edition)
isSpacesEnabled: isSpacesEnabled,
allowHyphenatedSubdomains: allowHyphenatedSubdomains,
// for testing resets to defaults
_reset: _reset
@@ -221,11 +220,6 @@ function isSpacesEnabled() {
return get('edition') === 'education';
}
function allowHyphenatedSubdomains() {
// we should move caas also to hostingprovider edition at some point
return get('edition') === 'hostingprovider' || get('provider') === 'caas';
}
function provider() {
return get('provider');
}

View File

@@ -208,8 +208,6 @@ function add(domain, zoneName, provider, dnsConfig, fallbackCertificate, tlsConf
zoneName = tld.getDomain(domain) || domain;
}
if (dnsConfig.hyphenatedSubdomains && !config.allowHyphenatedSubdomains()) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Not allowed in this edition'));
if (fallbackCertificate) {
let subdomain = dnsConfig.hyphenatedSubdomains ? `test-${domain}` : `test.${domain}`;
let error = reverseProxy.validateCertificate(subdomain, fallbackCertificate.cert, fallbackCertificate.key);
@@ -300,8 +298,6 @@ function update(domain, zoneName, provider, dnsConfig, fallbackCertificate, tlsC
zoneName = result.zoneName;
}
if (dnsConfig.hyphenatedSubdomains && !config.allowHyphenatedSubdomains()) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Not allowed in this edition'));
if (fallbackCertificate) {
let subdomain = dnsConfig.hyphenatedSubdomains ? `test-${domain}` : `test.${domain}`;
let error = reverseProxy.validateCertificate(subdomain, fallbackCertificate.cert, fallbackCertificate.key);