mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Fix acme_status / ACME_eligible
This commit is contained in:
parent
96233ea600
commit
1a543fe416
2 changed files with 5 additions and 5 deletions
|
@ -90,13 +90,13 @@ i18n = "domain_config"
|
||||||
[cert.cert.acme_eligible_explain]
|
[cert.cert.acme_eligible_explain]
|
||||||
type = "alert"
|
type = "alert"
|
||||||
style = "warning"
|
style = "warning"
|
||||||
visible = "acme_eligible == false"
|
visible = "acme_eligible == false || acme_elligible == null"
|
||||||
|
|
||||||
[cert.cert.cert_no_checks]
|
[cert.cert.cert_no_checks]
|
||||||
ask = "Ignore diagnosis checks"
|
ask = "Ignore diagnosis checks"
|
||||||
type = "boolean"
|
type = "boolean"
|
||||||
default = false
|
default = false
|
||||||
visible = "acme_eligible == false"
|
visible = "acme_eligible == false || acme_elligible == null"
|
||||||
|
|
||||||
[cert.cert.cert_install]
|
[cert.cert.cert_install]
|
||||||
type = "button"
|
type = "button"
|
||||||
|
|
|
@ -98,12 +98,12 @@ def certificate_status(domains, full=False):
|
||||||
if full:
|
if full:
|
||||||
try:
|
try:
|
||||||
_check_domain_is_ready_for_ACME(domain)
|
_check_domain_is_ready_for_ACME(domain)
|
||||||
status["acme_status"] = 'eligible'
|
status["ACME_eligible"] = True
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
if e.key == 'certmanager_domain_not_diagnosed_yet':
|
if e.key == 'certmanager_domain_not_diagnosed_yet':
|
||||||
status["acme_status"] = 'unknown'
|
status["ACME_eligible"] = None # = unknown status
|
||||||
else:
|
else:
|
||||||
status["acme_status"] = 'ineligible'
|
status["ACME_eligible"] = False
|
||||||
|
|
||||||
|
|
||||||
del status["domain"]
|
del status["domain"]
|
||||||
|
|
Loading…
Add table
Reference in a new issue