Merge branch 'v1.6' into v1.7

This commit is contained in:
Fernandez Ludovic 2018-09-07 10:11:30 +02:00
commit 538424b01c
4 changed files with 49 additions and 14 deletions

View file

@ -540,6 +540,8 @@ func (s *Server) postLoadConfiguration() {
domains, err := rls.ParseDomains(route.Rule)
if err != nil {
log.Errorf("Error parsing domains: %v", err)
} else if len(domains) == 0 {
log.Debugf("No domain parsed in rule %q", route.Rule)
} else {
s.globalConfiguration.ACME.LoadCertificateForDomains(domains)
}