From 90e63edcfe5af42b6655a582157962f02c7592bf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 7 Nov 2016 14:19:28 -0500 Subject: [PATCH] Improving/cleaning CLI display of cert-status --- src/yunohost/certificate.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py index 78c0c2ed5..d2a67495a 100644 --- a/src/yunohost/certificate.py +++ b/src/yunohost/certificate.py @@ -89,7 +89,7 @@ def certificate_status(auth, domain_list, full=False): if domain not in yunohost_domains_list: raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_domain_unknown', domain=domain)) - lines = [] + certificates = {} for domain in domain_list: status = _get_status(domain) @@ -97,10 +97,13 @@ def certificate_status(auth, domain_list, full=False): if not full: del status["subject"] del status["CA_name"] + status["CA_type"] = status["CA_type"]["verbose"] + status["summary"] = status["summary"]["verbose"] - lines.append(status) + del status["domain"] + certificates[domain] = status - return { "certificates" : lines } + return { "certificates" : certificates } def certificate_install(auth, domain_list, force=False, no_checks=False, self_signed=False):