diff --git a/chatmaild/src/chatmaild/config.py b/chatmaild/src/chatmaild/config.py index f0f6724c..db79d75d 100644 --- a/chatmaild/src/chatmaild/config.py +++ b/chatmaild/src/chatmaild/config.py @@ -161,31 +161,7 @@ def get_default_config_content(mail_domain, **overrides): 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 - - if mail_domain.endswith(".testrun.org"): - override_inipath = inidir.joinpath("override-testrun.ini") - privacy = iniconfig.IniConfig(override_inipath)["privacy"] - lines = [] - for line in content.split("\n"): - for key, value in privacy.items(): - value_lines = value.format(mail_domain=mail_domain).strip().split("\n") - if not line.startswith(f"{key} =") or not value_lines: - continue - if len(value_lines) == 1: - lines.append(f"{key} = {value}") - else: - lines.append(f"{key} =") - for vl in value_lines: - lines.append(f" {vl}") - break - else: - lines.append(line) - content = "\n".join(lines) - return content + return "\n".join(new_lines) def is_valid_ipv4(address: str) -> bool: diff --git a/chatmaild/src/chatmaild/ini/override-testrun.ini b/chatmaild/src/chatmaild/ini/override-testrun.ini deleted file mode 100644 index af337173..00000000 --- a/chatmaild/src/chatmaild/ini/override-testrun.ini +++ /dev/null @@ -1,16 +0,0 @@ - -[privacy] - -passthrough_recipients = privacy@testrun.org echo@{mail_domain} - -privacy_postal = - Merlinux GmbH, Represented by the managing director H. Krekel, - Reichgrafen Str. 20, 79102 Freiburg, Germany - -privacy_mail = privacy@testrun.org -privacy_pdo = - Prof. Dr. Fabian Schmieder, lexICT UG (limited), Ostfeldstr. 49, 30559 Hannover. - You can contact him at *delta-privacy@merlinux.eu* (Keyword: DPO) -privacy_supervisor = - State Commissioner for Data Protection and Freedom of Information of - Baden-Württemberg in 70173 Stuttgart, Germany. diff --git a/chatmaild/src/chatmaild/tests/test_config.py b/chatmaild/src/chatmaild/tests/test_config.py index 9abab7bf..bde15ca8 100644 --- a/chatmaild/src/chatmaild/tests/test_config.py +++ b/chatmaild/src/chatmaild/tests/test_config.py @@ -36,26 +36,17 @@ def test_read_config_basic_using_defaults(tmp_path, maildomain): example_config = read_config(inipath) assert example_config.max_user_send_per_minute == 60 assert example_config.filtermail_smtp_port_incoming == 10081 - - -def test_read_config_testrun(make_config): - config = make_config("something.testrun.org") - assert config.mail_domain == "something.testrun.org" - assert len(config.privacy_postal.split("\n")) > 1 - assert len(config.privacy_supervisor.split("\n")) > 1 - assert len(config.privacy_pdo.split("\n")) > 1 - assert config.privacy_mail == "privacy@testrun.org" - assert config.filtermail_smtp_port == 10080 - assert config.postfix_reinject_port == 10025 - assert config.max_user_send_per_minute == 60 - assert config.max_mailbox_size == "500M" - assert config.delete_mails_after == "20" - assert config.delete_large_after == "7" - assert config.username_min_length == 9 - assert config.username_max_length == 9 - assert config.password_min_length == 9 - assert "privacy@testrun.org" in config.passthrough_recipients - assert config.passthrough_senders == [] + assert example_config.filtermail_smtp_port == 10080 + assert example_config.postfix_reinject_port == 10025 + assert example_config.max_user_send_per_minute == 60 + assert example_config.max_mailbox_size == "500M" + assert example_config.delete_mails_after == "20" + assert example_config.delete_large_after == "7" + assert example_config.username_min_length == 9 + assert example_config.username_max_length == 9 + assert example_config.password_min_length == 9 + assert example_config.passthrough_recipients == [] + assert example_config.passthrough_senders == [] def test_config_userstate_paths(make_config, tmp_path):