beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Is this it?

Browse source
This commit is contained in:
David Duque 2020-04-18 00:22:10 +01:00
parent 8f247e3b70
commit eee5dbf755
No known key found for this signature in database
GPG key ID: 2F327738A3C0AE3A
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
management/daemon.py
View file

@ -551,7 +551,7 @@ def smtp_relay_set():
"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_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"]:
# Edit the sasl password
with open("/etc/postfix/sasl_passwd", "w") as f:

4
management/editconf.py
View file

@ -26,7 +26,7 @@
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()
buf = ""
input_lines = list(open(filename, "r+"))
@ -140,4 +140,4 @@ if __name__ == "__main__":
print("Invalid command line: ", subprocess.list2cmdline(sys.argv))
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)