allow hyphenated subdomains on all editions
This commit is contained in:
@@ -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');
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user