cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-21 05:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: fix overriding chatmail.ini params

Browse Source
This commit is contained in:
missytake
2026-02-03 16:32:18 +01:00
parent 27443ca044
commit 151d6ef445
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,10 +112,10 @@ def get_default_config_content(mail_domain, **overrides):
if mail_domain.endswith(".testrun.org"): if mail_domain.endswith(".testrun.org"):
override_inipath = inidir.joinpath("override-testrun.ini") override_inipath = inidir.joinpath("override-testrun.ini")
privacy = iniconfig.IniConfig(override_inipath)["privacy"] params = iniconfig.IniConfig(override_inipath)["params"]
lines = [] lines = []
for line in content.split("\n"): for line in content.split("\n"):
for key, value in privacy.items(): for key, value in params.items():
value_lines = value.format(mail_domain=mail_domain).strip().split("\n") value_lines = value.format(mail_domain=mail_domain).strip().split("\n")
if not line.startswith(f"{key} =") or not value_lines: if not line.startswith(f"{key} =") or not value_lines:
continue continue

2
chatmaild/src/chatmaild/ini/override-testrun.ini
View File

@@ -2,8 +2,6 @@
tmpfs_index = true tmpfs_index = true
[privacy]
passthrough_recipients = privacy@testrun.org echo@{mail_domain} passthrough_recipients = privacy@testrun.org echo@{mail_domain}
privacy_postal = privacy_postal =