From 13dd64798a6f8b6f44ef3ad25eb79cb7888d1db8 Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 18 Feb 2026 00:37:53 +0100 Subject: [PATCH] config: load default values from Config(), not chatmail.ini.f --- chatmaild/src/chatmaild/config.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/chatmaild/src/chatmaild/config.py b/chatmaild/src/chatmaild/config.py index af6fef0d..2aef0012 100644 --- a/chatmaild/src/chatmaild/config.py +++ b/chatmaild/src/chatmaild/config.py @@ -9,12 +9,7 @@ from chatmaild.user import User def read_config(inipath): assert Path(inipath).exists(), inipath cfg = iniconfig.IniConfig(inipath) - params = cfg.sections["params"] - default_config_content = get_default_config_content(params["mail_domain"]) - df_params = iniconfig.IniConfig("ini", data=default_config_content)["params"] - new_params = dict(df_params.items()) - new_params.update(params) - return Config(inipath, params=new_params) + return Config(inipath, params=cfg.sections["params"]) class Config: @@ -23,16 +18,18 @@ class Config: self.mail_domain = params["mail_domain"] self.max_user_send_per_minute = int(params.get("max_user_send_per_minute", 60)) self.max_user_send_burst_size = int(params.get("max_user_send_burst_size", 10)) - self.max_mailbox_size = params["max_mailbox_size"] - self.max_message_size = int(params.get("max_message_size", "31457280")) - self.delete_mails_after = params["delete_mails_after"] - self.delete_large_after = params["delete_large_after"] - self.delete_inactive_users_after = int(params["delete_inactive_users_after"]) - self.username_min_length = int(params["username_min_length"]) - self.username_max_length = int(params["username_max_length"]) - self.password_min_length = int(params["password_min_length"]) - self.passthrough_senders = params["passthrough_senders"].split() - self.passthrough_recipients = params["passthrough_recipients"].split() + self.max_mailbox_size = params.get("max_mailbox_size", "500M") + self.max_message_size = int(params.get("max_message_size", 31457280)) + self.delete_mails_after = params.get("delete_mails_after", "20") + self.delete_large_after = params.get("delete_large_after", "7") + self.delete_inactive_users_after = int( + params.get("delete_inactive_users_after", 100) + ) + self.username_min_length = int(params.get("username_min_length", 9)) + self.username_max_length = int(params.get("username_max_length", 9)) + self.password_min_length = int(params.get("password_min_length", 9)) + self.passthrough_senders = params.get("passthrough_senders", "").split() + self.passthrough_recipients = params.get("passthrough_recipients", "").split() self.www_folder = params.get("www_folder", "") self.filtermail_smtp_port = int(params.get("filtermail_smtp_port", "10080")) self.filtermail_smtp_port_incoming = int(