nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-06-10 11:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Name module ldap to postfix

Browse Source 
There is nothing related to LDAP in the module. It actually configures postfix.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2022-02-16 11:35:38 -08:00 committed by James Valleroy
parent 59e51faf2e
commit e08988507e
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/modules/email/__init__.py
View File

@ -180,7 +180,7 @@ def setup(helper, old_version=None):
app.get_component('letsencrypt-email-postfix').setup_certificates()
app.get_component('letsencrypt-email-dovecot').setup_certificates()
helper.call('post', privileged.domain.set_domains)
helper.call('post', privileged.ldap.repair)
helper.call('post', privileged.postfix.repair)
helper.call('post', privileged.spam.repair)
# Reload

4
plinth/modules/email/privileged/__init__.py
View File

@ -3,6 +3,6 @@
Provides diagnosis and repair of email server configuration issues
"""
from . import aliases, dkim, domain, home, ldap, spam, tls
from . import aliases, dkim, domain, home, postfix, spam, tls
__all__ = ['aliases', 'domain', 'dkim', 'home', 'ldap', 'spam', 'tls']
__all__ = ['aliases', 'domain', 'dkim', 'home', 'postfix', 'spam', 'tls']

31
plinth/modules/email/privileged/ldap.py → plinth/modules/email/privileged/postfix.py
View File

@ -6,7 +6,8 @@ submission services. Setup aliases database.
from plinth import actions
from .. import aliases, postfix
from .. import aliases
from .. import postfix as postconf
default_config = {
'smtpd_sasl_auth_enable':
@ -32,10 +33,10 @@ submission_options = {
'smtpd_client_restrictions': 'permit_sasl_authenticated,reject',
'smtpd_relay_restrictions': 'permit_sasl_authenticated,reject'
}
submission_service = postfix.Service(service='submission', type_='inet',
private='n', unpriv='-', chroot='y',
wakeup='-', maxproc='-', command='smtpd',
options=submission_options)
submission_service = postconf.Service(service='submission', type_='inet',
private='n', unpriv='-', chroot='y',
wakeup='-', maxproc='-', command='smtpd',
options=submission_options)
smtps_options = {
'syslog_name': 'postfix/smtps',
@ -43,10 +44,10 @@ smtps_options = {
'smtpd_sasl_auth_enable': 'yes',
'smtpd_relay_restrictions': 'permit_sasl_authenticated,reject'
}
smtps_service = postfix.Service(service='smtps', type_='inet', private='n',
unpriv='-', chroot='y', wakeup='-',
maxproc='-', command='smtpd',
options=smtps_options)
smtps_service = postconf.Service(service='smtps', type_='inet', private='n',
unpriv='-', chroot='y', wakeup='-',
maxproc='-', command='smtpd',
options=smtps_options)
SQLITE_ALIASES = 'sqlite:/etc/postfix/freedombox-aliases.cf'
@ -54,26 +55,26 @@ SQLITE_ALIASES = 'sqlite:/etc/postfix/freedombox-aliases.cf'
def repair():
"""Tries to repair SASL, mail submission, and user lookup settings."""
aliases.first_setup()
actions.superuser_run('email', ['ldap', 'setup'])
actions.superuser_run('email', ['postfix', 'setup'])
def action_setup():
postfix.set_config(default_config)
postconf.set_config(default_config)
_setup_submission()
_setup_alias_maps()
def _setup_submission():
"""Update configuration for smtps and smtp-submission."""
postfix.set_master_config(submission_service)
postfix.set_master_config(smtps_service)
postconf.set_master_config(submission_service)
postconf.set_master_config(smtps_service)
def _setup_alias_maps():
"""Setup alias maps to include an sqlite DB."""
alias_maps = postfix.get_config(['alias_maps'])['alias_maps']
alias_maps = postconf.get_config(['alias_maps'])['alias_maps']
alias_maps = alias_maps.replace(',', ' ').split(' ')
if SQLITE_ALIASES not in alias_maps:
alias_maps.append(SQLITE_ALIASES)
postfix.set_config({'alias_maps': ' '.join(alias_maps)})
postconf.set_config({'alias_maps': ' '.join(alias_maps)})