From 50c0858d53172c5f6190dd0a78d38381de437e7c Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 28 Jun 2019 11:09:27 -0700 Subject: [PATCH] letsencrypt: Remove special treatment for domain added from 'config' Signed-off-by: Sunil Mohan Adapa Reviewed-by: Joseph Nuthalapati --- plinth/modules/letsencrypt/__init__.py | 8 -------- plinth/modules/letsencrypt/templates/letsencrypt.html | 8 +------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py index b7aac0cb1..58c061785 100644 --- a/plinth/modules/letsencrypt/__init__.py +++ b/plinth/modules/letsencrypt/__init__.py @@ -168,14 +168,6 @@ def get_status(): """Get the current settings.""" status = actions.superuser_run('letsencrypt', ['get-status']) status = json.loads(status) - curr_dom = config.get_domainname() - current_domain = { - 'name': - curr_dom, - 'has_cert': (curr_dom in status['domains'] - and status['domains'][curr_dom]['certificate_available']), - } - status['current_domain'] = current_domain for domain_type, domains in names.domains.items(): # XXX: Remove when Let's Encrypt supports .onion addresses diff --git a/plinth/modules/letsencrypt/templates/letsencrypt.html b/plinth/modules/letsencrypt/templates/letsencrypt.html index 6b9379ddd..0fd2d503f 100644 --- a/plinth/modules/letsencrypt/templates/letsencrypt.html +++ b/plinth/modules/letsencrypt/templates/letsencrypt.html @@ -50,13 +50,7 @@ {% for domain, domain_status in status.domains.items %} - - {% if domain == status.current_domain.name %} - {{ domain }} - {% else %} - {{ domain }} - {% endif %} - + {{ domain }} {% if domain_status.certificate_available and domain_status.validity == "valid" %}