From 1a543fe4166f00aa332be6ee99d703d6cdab38f6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 5 Oct 2022 15:35:51 +0200 Subject: [PATCH] Fix acme_status / ACME_eligible --- share/config_domain.toml | 4 ++-- src/certificate.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/config_domain.toml b/share/config_domain.toml index 28c394cf1..a3607811b 100644 --- a/share/config_domain.toml +++ b/share/config_domain.toml @@ -90,13 +90,13 @@ i18n = "domain_config" [cert.cert.acme_eligible_explain] type = "alert" style = "warning" - visible = "acme_eligible == false" + visible = "acme_eligible == false || acme_elligible == null" [cert.cert.cert_no_checks] ask = "Ignore diagnosis checks" type = "boolean" default = false - visible = "acme_eligible == false" + visible = "acme_eligible == false || acme_elligible == null" [cert.cert.cert_install] type = "button" diff --git a/src/certificate.py b/src/certificate.py index 45453e170..5ca29ce55 100644 --- a/src/certificate.py +++ b/src/certificate.py @@ -98,12 +98,12 @@ def certificate_status(domains, full=False): if full: try: _check_domain_is_ready_for_ACME(domain) - status["acme_status"] = 'eligible' + status["ACME_eligible"] = True except Exception as e: if e.key == 'certmanager_domain_not_diagnosed_yet': - status["acme_status"] = 'unknown' + status["ACME_eligible"] = None # = unknown status else: - status["acme_status"] = 'ineligible' + status["ACME_eligible"] = False del status["domain"]