external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-12-25 07:47:05 +00:00
Code Issues Releases Wiki Activity

Swap tuple by a list

Browse Source
This commit is contained in:
David Duque 2020-04-17 23:48:39 +01:00
parent 858251045d
commit 625eca8ea4
No known key found for this signature in database
GPG Key ID: 2F327738A3C0AE3A
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
management/daemon.py
View File

@ -545,12 +545,12 @@ def smtp_relay_set():
config["SMTP_RELAY_USER"] = newconf.get("user") == "true" config["SMTP_RELAY_USER"] = newconf.get("user") == "true"
utils.write_settings(config, env) utils.write_settings(config, env)
# Write on Postfix config # Write on Postfix config
edit_conf("/etc/postfix/main.cf", ( edit_conf("/etc/postfix/main.cf", [
("relay_host", f"[{config['SMTP_RELAY_HOST']}]:587" if config["SMTP_RELAY_ENABLED"] else ""), ["relay_host", f"[{config['SMTP_RELAY_HOST']}]:587" if config["SMTP_RELAY_ENABLED"] else ""],
("smtp_sasl_auth_enable", "yes" if config["SMTP_RELAY_AUTH"] else "no"), ["smtp_sasl_auth_enable", "yes" if config["SMTP_RELAY_AUTH"] else "no"],
("smtp_sasl_security_options", "noanonymous" if config["SMTP_RELAY_AUTH"] else "anonymous"), ["smtp_sasl_security_options", "noanonymous" if config["SMTP_RELAY_AUTH"] else "anonymous"],
("smtp_sasl_tls_security_options", "noanonymous" if config["SMTP_RELAY_AUTH"] else "anonymous"), ["smtp_sasl_tls_security_options", "noanonymous" if config["SMTP_RELAY_AUTH"] else "anonymous"],
), False, False) ], False, False)
if config["SMTP_RELAY_AUTH"]: if config["SMTP_RELAY_AUTH"]:
# Edit the sasl password # Edit the sasl password
with open("/etc/postfix/sasl_passwd", "w") as f: with open("/etc/postfix/sasl_passwd", "w") as f: