mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2024-12-24 07:37:04 +00:00
Is this it?
This commit is contained in:
parent
8f247e3b70
commit
eee5dbf755
@ -551,7 +551,7 @@ def smtp_relay_set():
|
|||||||
"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"
|
||||||
], r"\s*=\s*", "#")
|
], 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
|
||||||
with open("/etc/postfix/sasl_passwd", "w") as f:
|
with open("/etc/postfix/sasl_passwd", "w") as f:
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
import sys, re
|
import sys, re
|
||||||
|
|
||||||
def edit_conf(filename, settings, delimiter_re, comment_char, folded_lines = False, testing = False):
|
def edit_conf(filename, settings, delimiter_re, delimiter, comment_char, folded_lines = False, testing = False):
|
||||||
found = set()
|
found = set()
|
||||||
buf = ""
|
buf = ""
|
||||||
input_lines = list(open(filename, "r+"))
|
input_lines = list(open(filename, "r+"))
|
||||||
@ -140,4 +140,4 @@ if __name__ == "__main__":
|
|||||||
print("Invalid command line: ", subprocess.list2cmdline(sys.argv))
|
print("Invalid command line: ", subprocess.list2cmdline(sys.argv))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
edit_conf(filename, settings, delimiter_re, comment_char, folded_lines, testing)
|
edit_conf(filename, settings, delimiter_re, delimiter, comment_char, folded_lines, testing)
|
||||||
|
Loading…
Reference in New Issue
Block a user