nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

email_server: tls: Drop unimplemented TLS forms/view

Browse Source 
- In FreedomBox we will obtain and manage certificates automatically. No need
for forms to manage TLS certificates

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2021-10-15 12:38:29 -07:00 committed by James Valleroy
parent ee544622be
commit 77a0d54632
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
4 changed files with 1 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plinth/modules/email_server/templates/email_security.html
View File

@ -1,27 +0,0 @@
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% extends "email_form_base.html" %}
{% load i18n %}
{% block content %}
{{ block.super }}
<form action="{{ request.path }}" method="post">
{% csrf_token %}
<fieldset>
<legend>{% trans "Postfix TLS" %}</legend>
{% include "tls_form.html" with prefix="postfix" proto="smtp" %}
</fieldset>
<fieldset>
<legend>{% trans "Dovecot TLS" %}</legend>
{% include "tls_form.html" with prefix="dovecot" proto="imap" %}
</fieldset>
<input class="btn btn-primary" type="submit"
name="btn_update" value="{% trans 'Update' %}">
</form>
{% endblock %}

69
plinth/modules/email_server/templates/tls_form.html
View File

@ -1,69 +0,0 @@
{# SPDX-License-Identifier: AGPL-3.0-or-later #}
{% load i18n %}
<div class="form-check form-group">
<input class="form-check-input" type="radio" id="{{ prefix }}_unchanged"
name="{{ prefix }}" value="unchanged" checked="1">
<label class="form-check-label" for="{{ prefix }}_unchanged">
{% trans "Keep current settings" %}
</label>
</div>
<div class="form-check form-group">
<input class="form-check-input" type="radio" id="{{ prefix }}_le"
name="{{ prefix }}" value="le">
<label class="form-check-label" for="{{ prefix }}_le">
{% trans "Use Let's Encrypt" %}
</label>
<div class="form-group row pl-4">
<label for="{{ prefix }}_le_text" class="col-sm-3 col-form-label">
{% trans "Common name" %}
</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="{{ prefix }}_le_text"
name="{{ prefix }}_le" placeholder="{{ proto }}.example.com">
</div>
</div>
</div>
<div class="form-check form-group">
<input class="form-check-input" type="radio" id="{{ prefix }}_custom"
name="{{ prefix }}" value="custom">
<label class="form-check-label" for="{{ prefix }}_custom">
{% trans "Use custom values" %}
</label>
<div class="form-group row pl-4">
<label for="{{ prefix }}_cert" class="col-sm-3 col-form-label">
{% trans "Certificate path" %}
</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="{{ prefix }}_cert"
name="{{ prefix }}_cert" placeholder="/path/to/ssl.pem">
</div>
</div>
<div class="form-group row pl-4">
<label for="{{ prefix }}_private" class="col-sm-3 col-form-label">
{% trans "Private key path" %}
</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="{{ prefix }}_private"
name="{{ prefix }}_private" placeholder="/path/to/ssl.key">
</div>
</div>
</div>
<div class="form-check form-group">
<input class="form-check-input" type="radio" id="{{ prefix }}_sys"
name="{{ prefix }}" value="sys">
<label class="form-check-label" for="{{ prefix }}_sys">
{% trans "Use system default" %}
</label>
</div>

1
plinth/modules/email_server/urls.py
View File

@ -8,7 +8,6 @@ from . import views
urlpatterns = [ urlpatterns = [
path('apps/email_server/', views.EmailServerView.as_view(), name='index'), 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/domains', views.DomainView.as_view()),
path('apps/email_server/my_mail', path('apps/email_server/my_mail',
non_admin_view(views.MyMailView.as_view()), name='my_mail'), non_admin_view(views.MyMailView.as_view()), name='my_mail'),

7
plinth/modules/email_server/views.py
View File

@ -21,8 +21,7 @@ from . import audit, forms
class TabMixin(View): class TabMixin(View):
admin_tabs = [('', _('Home')), ('security', _('Security')), admin_tabs = [('', _('Home')), ('domains', _('Domains'))]
('domains', _('Domains'))]
def get_context_data(self, *args, **kwargs): def get_context_data(self, *args, **kwargs):
# Retrieve context data from the next method in the MRO # 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']) aliases_module.put(self._get_uid(), form.cleaned_data['alias'])
class TLSView(TabMixin, TemplateView):
template_name = 'email_security.html'
class DomainView(TabMixin, TemplateView): class DomainView(TabMixin, TemplateView):
template_name = 'email_domains.html' template_name = 'email_domains.html'