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: Drop some unused code

Browse Source 
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-12-14 19:00:11 -08:00 committed by James Valleroy
parent 747a5f120f
commit 9a2d66c62f
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plinth/modules/email_server/audit/ldap.py
View File

@ -53,7 +53,6 @@ default_smtps_options = {
'smtpd_relay_restrictions': 'permit_sasl_authenticated,reject' 'smtpd_relay_restrictions': 'permit_sasl_authenticated,reject'
} }
MAILSRV_DIR = '/var/lib/plinth/mailsrv'
SQLITE_ALIASES = 'sqlite:/etc/postfix/freedombox-aliases.cf' SQLITE_ALIASES = 'sqlite:/etc/postfix/freedombox-aliases.cf'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -144,16 +143,3 @@ def action_set_ulookup():
"""Handles email_server -i ldap set_ulookup""" """Handles email_server -i ldap set_ulookup"""
with postconf.mutex.lock_all(): with postconf.mutex.lock_all():
fix_alias_maps(check_alias_maps()) fix_alias_maps(check_alias_maps())
def list_find(lst, element, start=None, end=None):
if start is None:
start = 0
if end is None:
end = len(lst)
if start < 0 or end < 0:
return -1
try:
return lst.index(element, start, end)
except ValueError:
return -1

14
plinth/modules/email_server/forms.py
View File

@ -6,26 +6,12 @@ import re
from django import forms from django import forms
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import RegexValidator
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from plinth.modules.names.components import DomainName from plinth.modules.names.components import DomainName
from . import aliases as aliases_module from . import aliases as aliases_module
domain_validator = RegexValidator(r'^[A-Za-z0-9-\.]+$',
_('Enter a valid domain'))
destination_validator = RegexValidator(
r'^[ -~]+$', # ASCII chars from 32 to 126
_('Enter a valid destination'))
class EmailServerForm(forms.Form):
domain = forms.CharField(label=_('domain'), max_length=256)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def _get_domain_choices(): def _get_domain_choices():
"""Double domain entries for inclusion in the choice field.""" """Double domain entries for inclusion in the choice field."""