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

email: Fix issue with certs not being available

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 2022-02-25 14:22:44 -08:00 committed by James Valleroy
parent 9d4ae972e9
commit 354985f97c
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plinth/modules/email/privileged/domain.py
View File

@ -9,9 +9,9 @@ See: http://www.postfix.org/postconf.5.html#myhostname
import pathlib
import re
import subprocess
from plinth.actions import superuser_run
from plinth.app import App
from plinth.modules import config
from plinth.modules.email import postfix
from plinth.modules.names.components import DomainName
@ -36,11 +36,17 @@ def set_domains(primary_domain=None):
if primary_domain not in all_domains:
primary_domain = config.get_domainname() or list(all_domains)[0]
# Update configuration and don't restart daemons
superuser_run(
'email',
['domain', 'set_domains', primary_domain, ','.join(all_domains)])
superuser_run('email', ['dkim', 'setup_dkim', primary_domain])
# Copy certificates (self-signed if needed) and restart daemons
app = App.get('email')
app.get_component('letsencrypt-email-postfix').setup_certificates()
app.get_component('letsencrypt-email-dovecot').setup_certificates()
def action_set_domains(primary_domain, all_domains):
"""Set the primary domain and all the domains for postfix."""
@ -58,10 +64,6 @@ def action_set_domains(primary_domain, all_domains):
pathlib.Path('/etc/mailname').write_text(primary_domain + '\n')
tls.set_postfix_config(primary_domain, all_domains)
tls.set_dovecot_config(primary_domain, all_domains)
subprocess.run(['systemctl', 'try-reload-or-restart', 'postfix'],
check=True)
subprocess.run(['systemctl', 'try-reload-or-restart', 'dovecot'],
check=True)
def _clean_domain(domain):