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

SMTP Relays: Wrap ternary operations correctly

Browse Source
This commit is contained in:
David Duque 2020-04-21 14:35:51 +01:00
parent 8aa1ea23c8
commit 372d5d9783
No known key found for this signature in database
GPG Key ID: 2F327738A3C0AE3A
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
management/daemon.py
View File

@ -549,10 +549,10 @@ def smtp_relay_set():
utils.write_settings(config, env) utils.write_settings(config, env)
# Write on Postfix configs # Write on Postfix configs
edit_conf("/etc/postfix/main.cf", [ edit_conf("/etc/postfix/main.cf", [
"relayhost=" + f"[{config['SMTP_RELAY_HOST']}]:587" if config["SMTP_RELAY_ENABLED"] else "", "relayhost=" + (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")
], delimiter_re=r"\s*=\s*", delimiter="=", comment_char="#") ], delimiter_re=r"\s*=\s*", delimiter="=", comment_char="#")
if config["SMTP_RELAY_AUTH"]: if config["SMTP_RELAY_AUTH"]:
# Edit the sasl password # Edit the sasl password