From 77a0d54632b1cb3ff7361cbcb2dc8c0fd5600924 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 15 Oct 2021 12:38:29 -0700 Subject: [PATCH] email_server: tls: Drop unimplemented TLS forms/view - In FreedomBox we will obtain and manage certificates automatically. No need for forms to manage TLS certificates Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .../templates/email_security.html | 27 -------- .../email_server/templates/tls_form.html | 69 ------------------- plinth/modules/email_server/urls.py | 1 - plinth/modules/email_server/views.py | 7 +- 4 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 plinth/modules/email_server/templates/email_security.html delete mode 100644 plinth/modules/email_server/templates/tls_form.html diff --git a/plinth/modules/email_server/templates/email_security.html b/plinth/modules/email_server/templates/email_security.html deleted file mode 100644 index 0a65916f2..000000000 --- a/plinth/modules/email_server/templates/email_security.html +++ /dev/null @@ -1,27 +0,0 @@ -{# SPDX-License-Identifier: AGPL-3.0-or-later #} -{% extends "email_form_base.html" %} - -{% load i18n %} - -{% block content %} - - {{ block.super }} - -
- {% csrf_token %} -
- {% trans "Postfix TLS" %} - {% include "tls_form.html" with prefix="postfix" proto="smtp" %} -
- -
- {% trans "Dovecot TLS" %} - {% include "tls_form.html" with prefix="dovecot" proto="imap" %} -
- - -
- -{% endblock %} - diff --git a/plinth/modules/email_server/templates/tls_form.html b/plinth/modules/email_server/templates/tls_form.html deleted file mode 100644 index 544f6e55b..000000000 --- a/plinth/modules/email_server/templates/tls_form.html +++ /dev/null @@ -1,69 +0,0 @@ -{# SPDX-License-Identifier: AGPL-3.0-or-later #} - -{% load i18n %} - - -
- - -
- - -
- - - -
- -
- -
-
-
- - -
- - - -
- -
- -
-
- -
- -
- -
-
-
- - -
- - -
diff --git a/plinth/modules/email_server/urls.py b/plinth/modules/email_server/urls.py index 9121a3b33..c8bf07e26 100644 --- a/plinth/modules/email_server/urls.py +++ b/plinth/modules/email_server/urls.py @@ -8,7 +8,6 @@ from . import views urlpatterns = [ path('apps/email_server/', views.EmailServerView.as_view(), name='index'), - path('apps/email_server/security', views.TLSView.as_view()), path('apps/email_server/domains', views.DomainView.as_view()), path('apps/email_server/my_mail', non_admin_view(views.MyMailView.as_view()), name='my_mail'), diff --git a/plinth/modules/email_server/views.py b/plinth/modules/email_server/views.py index 17792a52a..e0f54dff4 100644 --- a/plinth/modules/email_server/views.py +++ b/plinth/modules/email_server/views.py @@ -21,8 +21,7 @@ from . import audit, forms class TabMixin(View): - admin_tabs = [('', _('Home')), ('security', _('Security')), - ('domains', _('Domains'))] + admin_tabs = [('', _('Home')), ('domains', _('Domains'))] def get_context_data(self, *args, **kwargs): # Retrieve context data from the next method in the MRO @@ -212,10 +211,6 @@ class AliasView(FormView): aliases_module.put(self._get_uid(), form.cleaned_data['alias']) -class TLSView(TabMixin, TemplateView): - template_name = 'email_security.html' - - class DomainView(TabMixin, TemplateView): template_name = 'email_domains.html'