wildcard is valid subdomain

This commit is contained in:
Peter Hormanns 2020-06-10 19:31:02 +02:00
parent ad193bd365
commit 62bc6098e9

View File

@ -186,7 +186,7 @@ public class DomainModuleImpl extends AbstractModuleImpl {
dom.setDomainoptions(domainOptions); dom.setDomainoptions(domainOptions);
} }
if (dom.getValidsubdomainnames() == null) { if (dom.getValidsubdomainnames() == null) {
dom.setValidsubdomainnames("www"); dom.setValidsubdomainnames("*");
} }
final AbstractEntity newDomain = super.add(dom); final AbstractEntity newDomain = super.add(dom);
final GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction()); final GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction());
@ -233,9 +233,6 @@ public class DomainModuleImpl extends AbstractModuleImpl {
} }
} }
for (DomainOption opt : domainOptions) { for (DomainOption opt : domainOptions) {
if ("letsencrypt".equals(opt.getName()) && updatedDom.getServeraliases().contains("*")) {
throw new HSAdminException("invalid domain option: " + opt.getName() + " for wildcard subdomain");
}
if ("backupmxforexternalmx".equals(opt.getName())) { if ("backupmxforexternalmx".equals(opt.getName())) {
final Query query = em.createQuery( final Query query = em.createQuery(
"SELECT e FROM " + EMailAddress.class.getAnnotation(javax.persistence.Entity.class).name() "SELECT e FROM " + EMailAddress.class.getAnnotation(javax.persistence.Entity.class).name()