cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-15 02:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove mailboxes_dir as default option

Browse Source
This commit is contained in:
holger krekel
2024-07-28 16:24:17 +02:00
parent b32a57105d
commit 1238ed95da
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
chatmaild/src/chatmaild/config.py
View File

@@ -27,7 +27,6 @@ class Config:
self.password_min_length = int(params["password_min_length"])
self.passthrough_senders = params["passthrough_senders"].split()
self.passthrough_recipients = params["passthrough_recipients"].split()
self.mailboxes_dir = Path(params["mailboxes_dir"].strip())
self.filtermail_smtp_port = int(params["filtermail_smtp_port"])
self.postfix_reinject_port = int(params["postfix_reinject_port"])
self.iroh_relay = params.get("iroh_relay")
@@ -36,6 +35,10 @@ class Config:
self.privacy_pdo = params.get("privacy_pdo")
self.privacy_supervisor = params.get("privacy_supervisor")
# deprecated option
mbdir = params.get("mailboxes_dir", f"/home/vmail/mail/{self.mail_domain}")
self.mailboxes_dir = Path(mbdir.strip())
# old unused option (except for first migration from sqlite to maildir store)
self.passdb_path = Path(params.get("passdb_path", "/home/vmail/passdb.sqlite"))
@@ -65,14 +68,19 @@ def write_initial_config(inipath, mail_domain, overrides):
# apply config overrides
new_lines = []
extra = overrides.copy()
for line in content.split("\n"):
new_line = line.strip()
if new_line and new_line[0] not in "#[":
name, value = map(str.strip, new_line.split("=", maxsplit=1))
value = overrides.get(name, value)
value = overrides.pop(name, value)
new_line = f"{name} = {value}"
new_lines.append(new_line)
for name, value in extra.items():
new_line = f"{name} = {value}"
new_lines.append(new_line)
content = "\n".join(new_lines)
# apply testrun privacy overrides

3
chatmaild/src/chatmaild/ini/chatmail.ini.f
View File

@@ -42,9 +42,6 @@ passthrough_recipients = xstore@testrun.org groupsbot@hispanilandia.net
# Deployment Details
#
# Directory where user mailboxes are stored
mailboxes_dir = /home/vmail/mail/{mail_domain}
# where the filtermail SMTP service listens
filtermail_smtp_port = 10080