diff --git a/lemur/dns_providers/cli.py b/lemur/dns_providers/cli.py index b111ca0e..159bdaa0 100644 --- a/lemur/dns_providers/cli.py +++ b/lemur/dns_providers/cli.py @@ -18,8 +18,12 @@ def get_all_zones(): acme_plugin = plugins.get("acme-issuer") for dns_provider in dns_providers: - zones = acme_plugin.get_all_zones(dns_provider) - set_domains(dns_provider, zones) + try: + zones = acme_plugin.get_all_zones(dns_provider) + set_domains(dns_provider, zones) + except Exception as e: + print("[+] Error with DNS Provider {}: {}".format(dns_provider.name, e)) + set_domains(dns_provider, []) status = SUCCESS_METRIC_STATUS diff --git a/lemur/plugins/lemur_acme/plugin.py b/lemur/plugins/lemur_acme/plugin.py index 876f7f8b..926035c4 100644 --- a/lemur/plugins/lemur_acme/plugin.py +++ b/lemur/plugins/lemur_acme/plugin.py @@ -212,6 +212,8 @@ class AcmeHandler(object): """ self.dns_providers_for_domain[domain] = [] for dns_provider in self.all_dns_providers: + if not dns_provider.domains: + continue for name in dns_provider.domains: if domain.endswith("." + name): self.dns_providers_for_domain[domain].append(dns_provider) diff --git a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html index 9410f42d..b64f6e3d 100644 --- a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html @@ -129,7 +129,7 @@ -