Compare commits

..
Author SHA1 Message Date
KamyarAT 0043954c29 fix: read account address from list_transports()
Delta Chat 2.63 stopped writing the legacy addr and mail_pw config keys.
Online tests that called get_config for those keys got None and crashed.

Read the address and password from list_transports() instead.
2026-10-10 14:13:04 +04:00
4 changed files with 1 additions and 24 deletions
-18
View File
@@ -167,24 +167,6 @@ class Deployer:
return self.put_template(src, dest, **kwargs)
return self.put_file(src, dest)
def comment_out(self, path: str, config_key: str, config_value: str = "", comment_char: str = "#", **kwargs):
"""Comment out a config parameter in a file with a
:param path: the config file to change
:param config_key: the key which should be commented out
:param config_value: the value that should be in the leftover comment
:param comment_char: the character the config file uses to comment out
"""
res = files.line(
name=f"Comment out {config_key} in {path}",
path=path ,
line=f"^({comment_char}|){config_key}=(.*)",
replace = f"{comment_char}{config_key}={config_value}",
extended_regex = True,
**kwargs,
)
return self._update_restart_signals(path, res)
def put_file(self, src, dest, mode="644", **kwargs):
if isinstance(src, str):
src = get_resource(src)
+1 -5
View File
@@ -354,11 +354,7 @@ class IrohDeployer(Deployer):
class JournaldDeployer(Deployer):
def configure(self):
overwrite_path = "/etc/systemd/journald.conf.d/90-volatile-logging.conf"
journald_conf = "/etc/systemd/journald.conf"
self.put_file("90-volatile-logging.conf", overwrite_path)
self.comment_out(journald_conf, "MaxRetentionSec", f"3d # set in {overwrite_path}")
self.comment_out(journald_conf, "Storage", f"volatile # set in {overwrite_path}")
self.put_file("journald.conf", "/etc/systemd/journald.conf")
def activate(self):
self.ensure_service("systemd-journald.service")
-1
View File
@@ -127,7 +127,6 @@ lmtp-filtermail_destination_concurrency_limit=10000
# Do not try to deliver messages for more than 2 days.
maximal_queue_lifetime = 2d
bounce_queue_lifetime = 2d
{% if not config.ipv4_relay %}
# DKIM-sign locally generated mail (bounces, DSNs).