self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-12 10:45:38 +02:00
Code Issues Releases Activity

Don't let people disable 465 and 993

Browse Source 
This is what we use for the other type of autoconfig... and really what
everyone should be using.
This commit is contained in:
Florent Daigniere 2024-06-22 10:20:32 +02:00
parent b3d49599cf
commit 5fb44bd719
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/admin/mailu/models.py
View File

@ -259,16 +259,16 @@ class Domain(Base):
""" return list of auto configuration records (RFC6186) """
hostname = app.config['HOSTNAME']
protocols = [
('imap', 143, 20 if 143 in app.config['PORTS'].split(',') else 0),
('pop3', 110, 20 if 110 in app.config['PORTS'].split(',') else 0),
('submission', 587, 20 if 587 in app.config['PORTS'].split(',') else 0),
('imap', 143, 20 if '143' in app.config['PORTS'].split(',') else 0),
('pop3', 110, 20 if '110' in app.config['PORTS'].split(',') else 0),
('submission', 587, 20 if '587' in app.config['PORTS'].split(',') else 0),
]
if app.config['TLS_FLAVOR'] != 'notls':
protocols.extend([
('autodiscover', 443, 10 if 443 in app.config['PORTS'].split(',') else 0),
('submissions', 465, 10 if 465 in app.config['PORTS'].split(',') else 0),
('imaps', 993, 10 if 993 in app.config['PORTS'].split(',') else 0),
('pop3s', 995, 10 if 995 in app.config['PORTS'].split(',') else 0),
('autodiscover', 443, 10 if '443' in app.config['PORTS'].split(',') else 0),
('submissions', 465, 10),
('imaps', 993, 10),
('pop3s', 995, 10 if '995' in app.config['PORTS'].split(',') else 0),
])
return [

4
core/nginx/dovecot/proxy.conf
View File

@ -102,7 +102,7 @@ service imap-login {
haproxy = yes
{% endif %}
}
{%- if TLS_993 and PORT_993 %}
{%- if TLS_993 %}
inet_listener imaps {
port = 993
ssl = yes
@ -149,7 +149,7 @@ service submission-login {
haproxy = yes
{% endif %}
}
{%- if TLS_465 and PORT_465 %}
{%- if TLS_465 %}
inet_listener submissions {
port = 465
ssl = yes